Map improvements and more tests.