Cleaning up geo tests (Not ready for merge)