Rename to be more specific
Fix spec for 1.8

As order of keys in hash is not guranteed