Fix the files, add tests
Renaming