HomeSoftware Heritage

Merge pull request #1074 from fatmcgav/test_fixup_take_2