Update GeoIP code and tests