BPay - test-fix-cycle

Various BPay related bug fixes, including a 0.30 service charge when
transaction count >= 4.