More restructuring of tests into suites