Improved test coverage for MapBuilder class.