geojson tests fixed, some tweaks