Testing maps: some duplication is still present, will remove later