Updated tests for new geo field naming and new fields