Renamed and fixed some tests