Rearrange some tests.