Fix tests dependent on hash ordering.