tests for geoip fix
fix merge conflict
Merge pull request #393 from gandalfar/geoip_fix2

Tests for GeoIP Fix