Shuffled some stuff around to make room for more test suites.