rearrange tests