Rearranging tests