Rearraged tests