Test fixes to support moving dummy payment processor to doPayment