Updated GoogleMapApi service and corresponding tests