Reorganize existing tests.