MakePaymentShould refactoring