Refactor adding the payment service and their tests