Reorganized test suites