Renamed test file
corrected merge