Add Geo spacing options and tests