Renamed and fixed breaking tests