Reorganizing the test