Renamed files and refactored the tests