Fix tests failing because of dict sort order