ticket:3 tests fixes