rearranging tests a bit