Renaming tests according to last refactoring.