Refactoring tests according to Exercises