Rearrange tests