Renamed some test methods