Updates for country resolution: add unit test