GeoQuery cleanup and testing refactoring