Refactor tests according to the previous refactoring.