diff --git a/test/cypress/integration/customer/customerAddress.spec.js b/test/cypress/integration/client/clientAddress.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerAddress.spec.js
rename to test/cypress/integration/client/clientAddress.spec.js
diff --git a/test/cypress/integration/customer/customerBalance.spec.js b/test/cypress/integration/client/clientBalance.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerBalance.spec.js
rename to test/cypress/integration/client/clientBalance.spec.js
diff --git a/test/cypress/integration/customer/customerBasicData.spec.js b/test/cypress/integration/client/clientBasicData.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerBasicData.spec.js
rename to test/cypress/integration/client/clientBasicData.spec.js
diff --git a/test/cypress/integration/customer/customerBillingData.spec.js b/test/cypress/integration/client/clientBillingData.spec.js
similarity index 86%
rename from test/cypress/integration/customer/customerBillingData.spec.js
rename to test/cypress/integration/client/clientBillingData.spec.js
index 00af82e39..16e8fc0fc 100644
--- a/test/cypress/integration/customer/customerBillingData.spec.js
+++ b/test/cypress/integration/client/clientBillingData.spec.js
@@ -8,6 +8,6 @@ describe('Client billing data', () => {
         });
     });
     it('Should load layout', () => {
-        cy.get('.q-card').should('be.visible');
+        cy.get('.q-page').should('be.visible');
     });
 });
diff --git a/test/cypress/integration/client/clientCredits.spec.js b/test/cypress/integration/client/clientCredits.spec.js
new file mode 100644
index 000000000..5f303b40d
--- /dev/null
+++ b/test/cypress/integration/client/clientCredits.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client credits', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/credits', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/customer/customerFiscalData.spec.js b/test/cypress/integration/client/clientFiscalData.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerFiscalData.spec.js
rename to test/cypress/integration/client/clientFiscalData.spec.js
diff --git a/test/cypress/integration/customer/customerGreuges.spec.js b/test/cypress/integration/client/clientGreuges.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerGreuges.spec.js
rename to test/cypress/integration/client/clientGreuges.spec.js
diff --git a/test/cypress/integration/customer/customerList.spec.js b/test/cypress/integration/client/clientList.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerList.spec.js
rename to test/cypress/integration/client/clientList.spec.js
diff --git a/test/cypress/integration/customer/customerNotes.spec.js b/test/cypress/integration/client/clientNotes.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerNotes.spec.js
rename to test/cypress/integration/client/clientNotes.spec.js
diff --git a/test/cypress/integration/client/clientRecoveries.spec.js b/test/cypress/integration/client/clientRecoveries.spec.js
new file mode 100644
index 000000000..ea6f14407
--- /dev/null
+++ b/test/cypress/integration/client/clientRecoveries.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client recoveries', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/recoveries', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/customer/customerSms.spec.js b/test/cypress/integration/client/clientSms.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerSms.spec.js
rename to test/cypress/integration/client/clientSms.spec.js
diff --git a/test/cypress/integration/customer/customerWebAccess.spec.js b/test/cypress/integration/client/clientWebAccess.spec.js
similarity index 100%
rename from test/cypress/integration/customer/customerWebAccess.spec.js
rename to test/cypress/integration/client/clientWebAccess.spec.js
diff --git a/test/cypress/integration/customer/credit-management/customerCreditContracts.spec.js b/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
similarity index 75%
rename from test/cypress/integration/customer/credit-management/customerCreditContracts.spec.js
rename to test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
index 3c35d5ed0..1c2f935fc 100644
--- a/test/cypress/integration/customer/credit-management/customerCreditContracts.spec.js
+++ b/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Client credit opinion', () => {
+describe('Client credit contracts', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -8,6 +8,6 @@ describe('Client credit opinion', () => {
         });
     });
     it('Should load layout', () => {
-        cy.get('.q-card').should('be.visible');
+        cy.get('.q-page').should('be.visible');
     });
 });
diff --git a/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js b/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
new file mode 100644
index 000000000..c32215f01
--- /dev/null
+++ b/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client credit opinion', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/credit-management/credit-opinion', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientConsumption.spec.js b/test/cypress/integration/client/others/clientConsumption.spec.js
new file mode 100644
index 000000000..bbc11998e
--- /dev/null
+++ b/test/cypress/integration/client/others/clientConsumption.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client consumption', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/others/consumption', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/customer/others/customerContacts.spec.js b/test/cypress/integration/client/others/clientContacts.spec.js
similarity index 100%
rename from test/cypress/integration/customer/others/customerContacts.spec.js
rename to test/cypress/integration/client/others/clientContacts.spec.js
diff --git a/test/cypress/integration/client/others/clientMandates.spec.js b/test/cypress/integration/client/others/clientMandates.spec.js
new file mode 100644
index 000000000..055eda2d0
--- /dev/null
+++ b/test/cypress/integration/client/others/clientMandates.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client mandates', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/others/mandates', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientSamples.spec.js b/test/cypress/integration/client/others/clientSamples.spec.js
new file mode 100644
index 000000000..a50120402
--- /dev/null
+++ b/test/cypress/integration/client/others/clientSamples.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client samples', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/others/samples', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/customer/others/customerUnpaid.spec.js b/test/cypress/integration/client/others/clientUnpaid.spec.js
similarity index 100%
rename from test/cypress/integration/customer/others/customerUnpaid.spec.js
rename to test/cypress/integration/client/others/clientUnpaid.spec.js
diff --git a/test/cypress/integration/client/others/clientWebPayments.spec.js b/test/cypress/integration/client/others/clientWebPayments.spec.js
new file mode 100644
index 000000000..f35b12612
--- /dev/null
+++ b/test/cypress/integration/client/others/clientWebPayments.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client web payments', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/others/web-payment', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 75b5eeec3..64c159f6d 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -254,9 +254,8 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 });
 
 Cypress.Commands.add('openActionsDescriptor', () => {
-    cy.get('[data-cy="descriptor-more-opts"]').click();
+    cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
 });
-
 Cypress.Commands.add('clickButtonsDescriptor', (id) => {
     cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
         .invoke('removeAttr', 'target')