Rearranging test locations