Rebuild normal repayment using tests