Reorganized the test structure.