Improve test coverage of Maps