Updated tests to only use hashing where necessary.