Reorganising tests.