Fix tests that fail due to hash randomization
Merge pull request #992 from hagberg/hashrandom-test-fixes

Fix tests that fail due to hash randomization