Merge branch '2803_homedir_in_tests'