Renamed class; cleaned up tests