Start of improving geo tests