ticket:5 tests rework