Renaming files, refactoring tests