Another hash randomization fix, and test with hash randomization