Renamed test classes to match non-test classes