Tests now account for the fact that the actual code iterates over a map, so the order can differ between test executions