Reorganizing test.