Renamed some classes to better reflect what is being tested.