Code cleanup for geolocation lookup tests
Follow-up of
!29 (comment 1216691)