Rework test hashing