more test fixes. Added mock patch to orderpayment tests