Renamed class.
Fixed broken unit test.