Reorganize tests.