Fix more tests.
Merge pull request #1203 from kayue/feature/payment-order

Multiple payments support.