GeoModuleTest added again regarding the conflict resolution