Renamed test files to main files