Renarrange tests.