[cleanUp] Renamed test files too