Renamed tests to reflect new master class name