Merge "Make unit tests not depend on random hash seed"