Renamed and relocated tests