Testing improvements for Maps.