Fixing failing focus tests

Change-Id: I3df6a72f6340cbf2e42ce4913e28471e9358088b
4 files changed