Add additional tests to Geo