diff --git a/webapp/e2e/steps/create-group.steps.js b/webapp/e2e/steps/create-group.steps.js
index 93fb1eac..6a76a6ce 100644
--- a/webapp/e2e/steps/create-group.steps.js
+++ b/webapp/e2e/steps/create-group.steps.js
@@ -43,15 +43,31 @@ defineFeature(feature, (test) => {
 
       await page.waitForSelector('[name="name"]');
       await page.type('[name="name"]', "Test Group");
-      await page.click("button", { text: "Crear" });
-      await page.waitForTimeout(1000);
-    });
+      await page.waitForTimeout(2000);
+      await page.evaluate(() => {
+        var botones = document.querySelectorAll('button.chakra-button.css-r7xd4a[data-testid="addgroup-button"]');
+        botones.forEach(function(boton) {
+          if (boton.textContent === "Crear") {
+            boton.click();
+          }
+        });
+      });
+  });
 
     then("The Group should be shown on the My Groups page", async () => {
+      await page.waitForTimeout(1000);
       await page.click('button[aria-label="Abrir menú"]');
-      await page.click('[data-testid="home-misgrupos-link"]');
+      await page.waitForTimeout(1000);
+      await page.evaluate(() => {
+        var enlaces = document.querySelectorAll('a.chakra-link.css-spn4bz[data-testid="home-misgrupos-link"]');
+        enlaces.forEach(function(enlace) {
+          if (enlace.textContent === "Mis grupos") {
+            enlace.click();
+          }
+        });
+      });
       //await page.waitForNavigation({ waitUntil: "networkidle0" });
-
+      await page.waitForTimeout(2000);
       const groupExists = await page.evaluate(() => {
         const groupName = "Test Group";
         const groups = Array.from(document.querySelectorAll("tbody tr td:first-child"));
diff --git a/webapp/e2e/steps/logout.steps.js b/webapp/e2e/steps/logout.steps.js
index 866ce961..651ee829 100644
--- a/webapp/e2e/steps/logout.steps.js
+++ b/webapp/e2e/steps/logout.steps.js
@@ -35,7 +35,7 @@ defineFeature(feature, (test) => {
       await page.waitForSelector("#login-password");
       await page.type("#login-password", password);
       await page.click("button", { text: "Login" });
-      await page.waitForNavigation({ waitUntil: "networkidle0" });
+      //await page.waitForNavigation({ waitUntil: "networkidle0" });
     });
 
     when("I click on the Logout link", async () => {
@@ -44,7 +44,7 @@ defineFeature(feature, (test) => {
       await page.click('button[aria-label="Abrir menú"]');
       await page.waitForSelector('[data-testid="home-logout-link"]');
       await page.click('[data-testid="home-logout-link"]');
-      await page.waitForNavigation({ waitUntil: "networkidle0" });
+      //await page.waitForNavigation({ waitUntil: "networkidle0" });
     });
 
     then("The user should be logged out and the Login screen should be shown", async () => {
diff --git a/webapp/e2e/steps/register-form.steps.js b/webapp/e2e/steps/register-form.steps.js
index c251ca93..fd603efd 100644
--- a/webapp/e2e/steps/register-form.steps.js
+++ b/webapp/e2e/steps/register-form.steps.js
@@ -32,7 +32,7 @@ defineFeature(feature, (test) => {
     });
 
     when("I fill the data in the form and press submit", async () => {
-      username = "testuser";
+      username = "papapa";
       password = "Testpassword1";
       await page.waitForSelector('#register-username');
       await page.type('#register-username', username);
diff --git a/webapp/src/components/Nav/Nav.js b/webapp/src/components/Nav/Nav.js
index 8009fc19..4606ff8a 100644
--- a/webapp/src/components/Nav/Nav.js
+++ b/webapp/src/components/Nav/Nav.js
@@ -318,7 +318,7 @@ const Nav = () => {
                       <Link href="/social/grupos" data-testid="home-grupos-link">
                         {t("components.nav.groups")}
                       </Link>
-                      <Link href="/social/misgrupos" data-testid="home-misgrupos-link">
+                      <Link href="/social/misgrupos" data-testid="home-mygroups-link">
                         {t("components.nav.usergroups")}
                       </Link>
                       <Link href="/stats" data-testid="home-stats-link">{t("components.nav.stats")}</Link>
@@ -329,7 +329,7 @@ const Nav = () => {
                   <Box>
                     <Flex flexDirection={"column"}>
                       <Link href="/config" data-testid="home-config-link">
-                        {t("components.nav.config")}
+                        {t("components.nav.options")}
                       </Link>
                       <Link href="/sobre" data-testid="home-sobre-link">
                         {t("components.nav.about")}
diff --git a/webapp/src/pages/Bateria/Bateria.js b/webapp/src/pages/Bateria/Bateria.js
index 5e7ab999..e9c868a3 100644
--- a/webapp/src/pages/Bateria/Bateria.js
+++ b/webapp/src/pages/Bateria/Bateria.js
@@ -230,6 +230,7 @@ const JuegoPreguntas = () => {
                     padding={"1rem"}
                     height={"fit-content"}
                     minHeight={"3rem"}
+                    data-testid={`answer-button-${index}`}
                   >
                     {respuesta}
                   </Button>
diff --git a/webapp/src/pages/Social/Groups.js b/webapp/src/pages/Social/Groups.js
index ebad1366..d0e3b193 100644
--- a/webapp/src/pages/Social/Groups.js
+++ b/webapp/src/pages/Social/Groups.js
@@ -117,7 +117,7 @@ const Groups = () => {
                 onChange={(e) => setName(e.target.value)}
               />
             </InputGroup>
-            <Button colorScheme="blue" onClick={addGroup}>
+            <Button colorScheme="blue" onClick={addGroup} data-testid="addgroup-button">
               {t("pages.groups.create")}
             </Button>
           </Box>