diff --git a/cypress/e2e/02-authorizeAfterAuthorization.cy.js b/cypress/e2e/02-authorizeAfterAuthorization.cy.js
index a17265d5..2a41c0eb 100644
--- a/cypress/e2e/02-authorizeAfterAuthorization.cy.js
+++ b/cypress/e2e/02-authorizeAfterAuthorization.cy.js
@@ -51,135 +51,135 @@ describe('PS1789 Tests Suite -> Authorization + After order creation', {
         cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
     })
 
-    // it('TWINT Checkouting', () => {
-    //     cy.visit('/en/order-history')
-    //     cy.changeCurrencyCHF()
-    //     cy.navigatingToThePaymentCHF()
-    //     cy.contains('Twint').click({ force: true })
+    // // it('TWINT Checkouting', () => {
+    // //     cy.visit('/en/order-history')
+    // //     cy.changeCurrencyCHF()
+    // //     cy.navigatingToThePaymentCHF()
+    // //     cy.contains('Twint').click({ force: true })
+    // //     cy.get('.condition-label > .js-terms').click({ force: true })
+    // //     cy.contains('Place order').click()
+    // //     cy.get('.saferpay-paymentpage').should('be.visible')
+    // //     cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
+    // // });
+
+    // it('Wechatpay Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Wechatpay').click({ force: true })
     //     cy.get('.condition-label > .js-terms').click({ force: true })
-    //     cy.contains('Place order').click()
+    //     cy.contains('Place order').click({ force: true })
     //     cy.get('.saferpay-paymentpage').should('be.visible')
     //     cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    // });
-
-    it('Wechatpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Wechatpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('.saferpay-paymentpage').should('be.visible')
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('MC Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Mastercard').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Sofort Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Sofort').should('be.visible')
-    })
-
-    it('Visa Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Visa').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Visa').should('be.visible')
-    })
-
-    it('AmericanExpressCheckouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('AmericanExpress').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillAmex()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('DinersClub Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('DinersClub').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillDiners()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
+    // })
 
-    it('Jcb Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Jcb').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillJcb()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
+    // it('MC Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Mastercard').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Place order').click({ force: true })
+    //     cy.get('[class="btn btn-next pay-button"]').click()
+    //     cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
+    // })
+
+    // it('Sofort Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Sofort').should('be.visible')
+    // })
+
+    // it('Visa Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Visa').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Visa').should('be.visible')
+    // })
 
-    it('Apple Pay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Applepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Applepay').should('be.visible')
-        // cy.contains('Place order').click({ force: true })
-        // cy.get('.btn-wallet-applepay').click()
-        // cy.get('#payButtonText').click()
-        // cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
+    // it('AmericanExpressCheckouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('AmericanExpress').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Place order').click({ force: true })
+    //     cy.FillAmex()
+    //     cy.get('[class="btn btn-next pay-button"]').click()
+    //     cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
+    // })
 
-    it('Myone Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        cy.contains('Myone').should('be.visible')
-    })
+    // it('DinersClub Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('DinersClub').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Place order').click({ force: true })
+    //     cy.FillDiners()
+    //     cy.get('[class="btn btn-next pay-button"]').click()
+    //     cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
+    // })
 
-    it('BonusCard Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Bonuscard').should('be.visible')
-    })
+    // it('Jcb Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Jcb').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Place order').click({ force: true })
+    //     cy.FillJcb()
+    //     cy.get('[class="btn btn-next pay-button"]').click()
+    //     cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
+    // })
 
-    it('Paypal Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Paypal').click({ force: true })
-        cy.contains('Paypal').should('be.visible')
-    })
+    // it('Apple Pay Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Applepay').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Applepay').should('be.visible')
+    //     // cy.contains('Place order').click({ force: true })
+    //     // cy.get('.btn-wallet-applepay').click()
+    //     // cy.get('#payButtonText').click()
+    //     // cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
+    // })
+
+    // it('Myone Checkouting', () => {
+    //     cy.visit('/en/order-history')
+    //     cy.changeCurrencyCHF()
+    //     cy.navigatingToThePaymentCHF()
+    //     cy.contains('Myone').should('be.visible')
+    // })
 
-    it('Unionpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Unionpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Unionpay').should('be.visible')
-    })
+    // it('BonusCard Checkouting', () => {
+    //     cy.visit('/en/order-history')
+    //     cy.changeCurrencyCHF()
+    //     cy.navigatingToThePaymentCHF()
+    //     //Payment method choosing
+    //     cy.contains('Bonuscard').should('be.visible')
+    // })
+
+    // it('Paypal Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Paypal').click({ force: true })
+    //     cy.contains('Paypal').should('be.visible')
+    // })
+
+    // it('Unionpay Checkouting', () => {
+    //     cy.navigatingToThePayment()
+    //     //Payment method choosing
+    //     cy.contains('Unionpay').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Unionpay').should('be.visible')
+    // })
 
-    it('Postfinancepay Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Postfinancepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('#redirectedPayButton').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
+    // it('Postfinancepay Checkouting', () => {
+    //     cy.visit('/en/order-history')
+    //     cy.changeCurrencyCHF()
+    //     cy.navigatingToThePaymentCHF()
+    //     //Payment method choosing
+    //     cy.contains('Postfinancepay').click({ force: true })
+    //     cy.get('.condition-label > .js-terms').click({ force: true })
+    //     cy.contains('Place order').click({ force: true })
+    //     cy.get('#redirectedPayButton').click()
+    //     cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
+    // })
 })
\ No newline at end of file
diff --git a/cypress/e2e/03-authorizeBeforeAuthorization.cy.js b/cypress/e2e/03-authorizeBeforeAuthorization.cy.js
deleted file mode 100644
index ac872999..00000000
--- a/cypress/e2e/03-authorizeBeforeAuthorization.cy.js
+++ /dev/null
@@ -1,174 +0,0 @@
-//Checking the console for errors
-let windowConsoleError;
-Cypress.on('window:before:load', (win) => {
-    windowConsoleError = cy.spy(win.console, 'error');
-})
-afterEach(() => {
-    expect(windowConsoleError).to.not.be.called;
-})
-
-describe('PS1789 Tests Suite -> Authorization + order creation before authorization', {
-    failFast: {
-        enabled: false,
-    },
-}, () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080)
-        cy.CachingBOFOPS1789()
-
-    })
-
-    it('Change the setting to Authorize', () => {
-        cy.visit('/admin1/')
-        cy.OpeningModuleDashboardURL()
-        cy.get('#SAFERPAY_PAYMENT_BEHAVIOR_1').click()
-        cy.get('#configuration_fieldset_2 > .panel-footer > .btn').click()
-    })
-    it('Change the setting create order before authorization', () => {
-        cy.visit('/admin1/')
-        cy.OpeningModuleDashboardURL()
-        cy.get('#SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION_0').click()
-        cy.get('#configuration_fieldset_2 > .panel-footer > .btn').click()
-    })
-
-
-    it('A2A guest success', () => {
-        cy.clearCookies()
-        cy.visit('/en/home/1-spproduct.html', { headers: {"Accept-Encoding": "gzip, deflate"}})
-        // cy.changeCurrencyCHF()
-        cy.guestCheckout()
-        cy.contains('Accounttoaccount').should('be.visible')
-
-    })
-    it('TWINT Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        cy.contains('Twint').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click()
-        cy.get('.saferpay-paymentpage').should('be.visible')
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    });
-
-    it('Wechatpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Wechatpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('.saferpay-paymentpage').should('be.visible')
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('MC Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Mastercard').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Sofort Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Sofort').should('be.visible')
-    })
-
-    it('Visa Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Visa').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Visa').should('be.visible')
-    })
-
-    it('AmericanExpressCheckouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('AmericanExpress').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillAmex()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('DinersClub Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('DinersClub').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillDiners()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Jcb Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Jcb').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillJcb()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Apple Pay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Applepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Applepay').should('be.visible')
-        // cy.contains('Place order').click({ force: true })
-        // cy.get('.btn-wallet-applepay').click()
-        // cy.get('#payButtonText').click()
-        // cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Myone Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        cy.contains('Myone').should('be.visible')
-    })
-
-    it('BonusCard Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Bonuscard').should('be.visible')
-    })
-
-    it('Paypal Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Paypal').click({ force: true })
-        cy.contains('Paypal').should('be.visible')
-    })
-
-    it('Unionpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Unionpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Unionpay').should('be.visible')
-    })
-
-    it('Postfinancepay Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Postfinancepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('#redirectedPayButton').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-})
\ No newline at end of file
diff --git a/cypress/e2e/04-captureAfterAuthorization.cy.js b/cypress/e2e/04-captureAfterAuthorization.cy.js
deleted file mode 100644
index f43634be..00000000
--- a/cypress/e2e/04-captureAfterAuthorization.cy.js
+++ /dev/null
@@ -1,173 +0,0 @@
-//Checking the console for errors
-let windowConsoleError;
-Cypress.on('window:before:load', (win) => {
-    windowConsoleError = cy.spy(win.console, 'error');
-})
-afterEach(() => {
-    expect(windowConsoleError).to.not.be.called;
-})
-
-describe('PS1789 Tests Suite -> With auto capture payments + create order after authorization', {
-    failFast: {
-        enabled: false,
-    },
-}, () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080)
-        cy.CachingBOFOPS1789()
-
-    })
-
-    it('Change the setting to Capture', () => {
-        cy.visit('/admin1/')
-        cy.OpeningModuleDashboardURL()
-        cy.get('#SAFERPAY_PAYMENT_BEHAVIOR_0').click()
-        cy.get('#configuration_fieldset_2 > .panel-footer > .btn').click()
-    })
-    it('Change the setting create order after authorization', () => {
-        cy.visit('/admin1/')
-        cy.OpeningModuleDashboardURL()
-        cy.get('#SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION_1').click()
-        cy.get('#configuration_fieldset_2 > .panel-footer > .btn').click()
-    })
-
-
-    it('A2A guest success', () => {
-        cy.clearCookies()
-        cy.visit('/en/home/1-spproduct.html', { headers: {"Accept-Encoding": "gzip, deflate"}})
-        // cy.changeCurrencyCHF()
-        cy.guestCheckout()
-        cy.contains('Accounttoaccount').should('be.visible')
-
-    })
-    it('TWINT Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        cy.contains('Twint').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click()
-        cy.get('.saferpay-paymentpage').should('be.visible')
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    });
-
-    it('Wechatpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Wechatpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('.saferpay-paymentpage').should('be.visible')
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('MC Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Mastercard').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Sofort Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Sofort').should('be.visible')
-    })
-
-    it('Visa Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Visa').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Visa').should('be.visible')
-    })
-
-    it('AmericanExpressCheckouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('AmericanExpress').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillAmex()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('DinersClub Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('DinersClub').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillDiners()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Jcb Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Jcb').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillJcb()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Apple Pay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Applepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('.btn-wallet-applepay').click()
-        cy.get('#payButtonText').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Myone Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        cy.contains('Myone').should('be.visible')
-    })
-
-    it('BonusCard Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Bonuscard').should('be.visible')
-    })
-
-    it('Paypal Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Paypal').click({ force: true })
-        cy.contains('Paypal').should('be.visible')
-    })
-
-    it('Unionpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Unionpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Unionpay').should('be.visible')
-    })
-
-    it('Postfinancepay Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Postfinancepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('#redirectedPayButton').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-})
\ No newline at end of file
diff --git a/cypress/e2e/05-captureBeforeAuthorization.cy.js b/cypress/e2e/05-captureBeforeAuthorization.cy.js
deleted file mode 100644
index bc4106ff..00000000
--- a/cypress/e2e/05-captureBeforeAuthorization.cy.js
+++ /dev/null
@@ -1,173 +0,0 @@
-//Checking the console for errors
-let windowConsoleError;
-Cypress.on('window:before:load', (win) => {
-    windowConsoleError = cy.spy(win.console, 'error');
-})
-afterEach(() => {
-    expect(windowConsoleError).to.not.be.called;
-})
-
-describe('PS1789 Tests Suite -> With auto capture payments and order creation before authorization', {
-    failFast: {
-        enabled: false,
-    },
-}, () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080)
-        cy.CachingBOFOPS1789()
-
-    })
-
-    it('Change the setting to Capture', () => {
-        cy.visit('/admin1/')
-        cy.OpeningModuleDashboardURL()
-        cy.get('#SAFERPAY_PAYMENT_BEHAVIOR_0').click()
-        cy.get('#configuration_fieldset_2 > .panel-footer > .btn').click()
-    })
-    it('Change the setting create order before authorization', () => {
-        cy.visit('/admin1/')
-        cy.OpeningModuleDashboardURL()
-        cy.get('#SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION_0').click()
-        cy.get('#configuration_fieldset_2 > .panel-footer > .btn').click()
-    })
-
-
-    it('A2A guest success', () => {
-        cy.clearCookies()
-        cy.visit('/en/home/1-spproduct.html', { headers: {"Accept-Encoding": "gzip, deflate"}})
-        // cy.changeCurrencyCHF()
-        cy.guestCheckout()
-        cy.contains('Accounttoaccount').should('be.visible')
-
-    })
-    it('TWINT Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        cy.contains('Twint').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click()
-        cy.get('.saferpay-paymentpage').should('be.visible')
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    });
-
-    it('Wechatpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Wechatpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('.saferpay-paymentpage').should('be.visible')
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('MC Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Mastercard').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Sofort Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Sofort').should('be.visible')
-    })
-
-    it('Visa Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Visa').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Visa').should('be.visible')
-    })
-
-    it('AmericanExpressCheckouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('AmericanExpress').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillAmex()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('DinersClub Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('DinersClub').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillDiners()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Jcb Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Jcb').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.FillJcb()
-        cy.get('[class="btn btn-next pay-button"]').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Apple Pay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Applepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('.btn-wallet-applepay').click()
-        cy.get('#payButtonText').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-
-    it('Myone Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        cy.contains('Myone').should('be.visible')
-    })
-
-    it('BonusCard Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Bonuscard').should('be.visible')
-    })
-
-    it('Paypal Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Paypal').click({ force: true })
-        cy.contains('Paypal').should('be.visible')
-    })
-
-    it('Unionpay Checkouting', () => {
-        cy.navigatingToThePayment()
-        //Payment method choosing
-        cy.contains('Unionpay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Unionpay').should('be.visible')
-    })
-
-    it('Postfinancepay Checkouting', () => {
-        cy.visit('/en/order-history')
-        cy.changeCurrencyCHF()
-        cy.navigatingToThePaymentCHF()
-        //Payment method choosing
-        cy.contains('Postfinancepay').click({ force: true })
-        cy.get('.condition-label > .js-terms').click({ force: true })
-        cy.contains('Place order').click({ force: true })
-        cy.get('#redirectedPayButton').click()
-        cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
-    })
-})
\ No newline at end of file
diff --git a/cypress/screenshots/01-moduleConfig.cy.js/PS1786 Module Configuration -- 01 Connecting the Test API information to module -- before each hook (failed).png b/cypress/screenshots/01-moduleConfig.cy.js/PS1786 Module Configuration -- 01 Connecting the Test API information to module -- before each hook (failed).png
new file mode 100644
index 00000000..29d67d95
Binary files /dev/null and b/cypress/screenshots/01-moduleConfig.cy.js/PS1786 Module Configuration -- 01 Connecting the Test API information to module -- before each hook (failed).png differ
diff --git a/cypress/screenshots/02-authorizeAfterAuthorization.cy.js/PS1789 Tests Suite - Authorization + After order creation -- Change the setting to Authorize -- before each hook (failed).png b/cypress/screenshots/02-authorizeAfterAuthorization.cy.js/PS1789 Tests Suite - Authorization + After order creation -- Change the setting to Authorize -- before each hook (failed).png
new file mode 100644
index 00000000..cf00be0c
Binary files /dev/null and b/cypress/screenshots/02-authorizeAfterAuthorization.cy.js/PS1789 Tests Suite - Authorization + After order creation -- Change the setting to Authorize -- before each hook (failed).png differ
diff --git a/cypress/videos/01-moduleConfig.cy.js.mp4 b/cypress/videos/01-moduleConfig.cy.js.mp4
new file mode 100644
index 00000000..9faf5d52
Binary files /dev/null and b/cypress/videos/01-moduleConfig.cy.js.mp4 differ
diff --git a/cypress/videos/02-authorizeAfterAuthorization.cy.js.mp4 b/cypress/videos/02-authorizeAfterAuthorization.cy.js.mp4
new file mode 100644
index 00000000..484fec3c
Binary files /dev/null and b/cypress/videos/02-authorizeAfterAuthorization.cy.js.mp4 differ
diff --git a/cypress/videos/03-authorizeBeforeAuthorization.cy.js.mp4 b/cypress/videos/03-authorizeBeforeAuthorization.cy.js.mp4
new file mode 100644
index 00000000..d86617ee
Binary files /dev/null and b/cypress/videos/03-authorizeBeforeAuthorization.cy.js.mp4 differ