HomeSoftware Heritage

Merge pull request #457 from alexjfisher/various_test_fixups