Renamed class and test