Test harness refactor and DepositSrm test (#17)