ticket:1 tests fix