Minor API change for addPaymentMethod
Fix broken payment test by previous commits