diff --git a/cypress/e2e/02-authorizeAfterAuthorization.cy.js b/cypress/e2e/02-authorizeAfterAuthorization.cy.js
index 8dc60cd7..078c7126 100644
--- a/cypress/e2e/02-authorizeAfterAuthorization.cy.js
+++ b/cypress/e2e/02-authorizeAfterAuthorization.cy.js
@@ -17,27 +17,26 @@ describe('PS817 Tests Suite -> Authorization + After order creation', {
 
     })
 
-    // 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 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 PM visible', () => {
-    //     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('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 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 PM visible', () => {
+        cy.clearCookies()
+        cy.visit('/en/home/1-spproduct.html', { headers: {"Accept-Encoding": "gzip, deflate"}})
+        cy.guestCheckout()
+        cy.contains('Accounttoaccount').should('be.visible')
+    })
 
     it('Twint guest success', () => {
         cy.clearCookies()
@@ -50,135 +49,124 @@ describe('PS817 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 })
-    // //     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')
-    // })
+    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