cleanup and fix tests after GeoJSON upgrade