Fix test failures due to unordered output of a map.