New map infrastructure and tests.