Simplifying switching to home for some tests

Change-Id: I696d0267a2c36a18080396657bed07f7b1654a7d
8 files changed