ticket:3 tests fixed