Reorganized the test configuration.