Rearranging tests again.