Renamed test classes to conform with others