Further cleanup of GeoIT tests