Greatly reduced usage of hashing in tests.