Fix tests due to non-deterministic order of hash