Renamed all the files
refactoted the tests