MX-1228 Import and fix-up geo tests