Renamed test files more appropriately.