ticket:5 tests code cleanup