Update computation of hash arguments
Add spec to ensure that this computation does not ‘drift’