ticket:4 tests fixed