Updating tests and fix for geospatial search