Renamed test suites to be easier to type