Renamed Test* classes which weren't tests