Update Location Service

Also, include some previous testing that is probably broken.