Task Two - tests refactoring