HC Test: cleanup test failures