removed some dependency on hash ordering in the tests