Rearange the tests.