first steps
(24)
Merge branch 'master' into testsForNonHelperClasses
added tests