Merge pull request #1468 from lorentey/hashes-are-random

Fix and reenable tests that depend on specific hash values