Rearrange curl tests