Renamed test files for better execution order