Rearrange order of tests