Renamed some test suites