renaming classes and refactoring tests