Updated geoenrichment tests to take Enrich setter updates into account