Reorganize test suite.