JUnit task v1.2.1 (Make some refactoring, to make it possible to do 5th task