ticket:5 separate tests by logic in classes
Merge branch 'ticket5'