CurrentLocationGateway tests, refactor. :stuck_out_tongue_closed_eyes: