Renamed some tests