[1067] Changes to handle different geo urls, and fixes for unit tests with new large data