Renamed files and added more tests