Mostly to have coverage of newly added code in map.c.