ref #6159
- Minor changes to make geoPoint testable
ref #6159
- merged!