rearranging tests