diff --git a/src/test/java/com/agile611/testng/webdriver/DuckDuckGoTest.java b/src/test/java/com/agile611/testng/webdriver/DuckDuckGoTest.java
index 15916e8..feb322f 100644
--- a/src/test/java/com/agile611/testng/webdriver/DuckDuckGoTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/DuckDuckGoTest.java
@@ -1,13 +1,13 @@
 package com.agile611.testng.webdriver;
 
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+
 import com.agile611.testng.webdriver.pages.ResultsPage;
 import com.agile611.testng.webdriver.pages.SearchPage;
-import org.testng.annotations.*;
 
-import static org.testng.Assert.*;
-
-public class DuckDuckGoTest extends BaseSaucelabsTest {
-    @Test //El propio test que hemos exportado de Katalon IDE
+public class DuckDuckGoTest extends BaseTest {
+    @Test
     public void testUntitledTestCase() throws Exception {
         SearchPage searchPage = new SearchPage(driver);
         searchPage.searchKeyword("pizza hawaiana");
diff --git a/src/test/java/com/agile611/testng/webdriver/HoversTest.java b/src/test/java/com/agile611/testng/webdriver/HoversTest.java
index 8b8d0c1..5e86769 100644
--- a/src/test/java/com/agile611/testng/webdriver/HoversTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/HoversTest.java
@@ -1,17 +1,14 @@
 package com.agile611.testng.webdriver;
 
+import java.time.Duration;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
-import org.testng.annotations.Test;
-
-import java.time.Duration;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
 
 public class HoversTest extends BaseTest {
 
diff --git a/src/test/java/com/agile611/testng/webdriver/InterrogationTest.java b/src/test/java/com/agile611/testng/webdriver/InterrogationTest.java
index 3d2c8ae..31023cd 100644
--- a/src/test/java/com/agile611/testng/webdriver/InterrogationTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/InterrogationTest.java
@@ -2,7 +2,7 @@ package com.agile611.testng.webdriver;
 
 import org.testng.annotations.Test;
 
-public class InterrogationTest extends BaseSaucelabsTest {
+public class InterrogationTest extends BaseTest {
     @Test //Opciones de Navegación
     public void testNavigation() throws Exception {
         driver.get("https://www.duckduckgo.com/"); //Navegar hasta duckduckgo
diff --git a/src/test/java/com/agile611/testng/webdriver/KeyboardKeysTest.java b/src/test/java/com/agile611/testng/webdriver/KeyboardKeysTest.java
index e7931cc..c6ab6dd 100644
--- a/src/test/java/com/agile611/testng/webdriver/KeyboardKeysTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/KeyboardKeysTest.java
@@ -3,11 +3,8 @@ package com.agile611.testng.webdriver;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
-import org.testng.annotations.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
 
 public class KeyboardKeysTest extends BaseTest {
     @Test
diff --git a/src/test/java/com/agile611/testng/webdriver/ManipulationTest.java b/src/test/java/com/agile611/testng/webdriver/ManipulationTest.java
index 6258e30..e5fa0d6 100644
--- a/src/test/java/com/agile611/testng/webdriver/ManipulationTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/ManipulationTest.java
@@ -3,19 +3,19 @@ package com.agile611.testng.webdriver;
 import org.openqa.selenium.By;
 import org.testng.annotations.Test;
 
-public class ManipulationTest extends BaseSaucelabsTest {
+public class ManipulationTest extends BaseTest {
     @Test //Opciones de Navegación
     public void testNavigation() throws Exception {
         driver.get("https://www.duckduckgo.com/"); //Navegar hasta duckduckgo
-        driver.findElement(By.id("search_form_input_homepage")).clear(); //Limpiar el text box
-        driver.findElement(By.id("search_form_input_homepage")).sendKeys("pizza hawaiana"); //Escribir en el text box
-        driver.findElement(By.id("search_form_homepage")).submit(); //Submit, darle al enter.
+        driver.findElement(By.id("searchbox_input")).clear(); //Limpiar el text box
+        driver.findElement(By.id("searchbox_input")).sendKeys("pizza hawaiana"); //Escribir en el text box
+        driver.findElement(By.id("searchbox_input")).submit(); //Submit, darle al enter.
         Thread.sleep(2000); //Espera forzada
 
         driver.get("https://www.duckduckgo.com/"); //Navegar hasta duckduckgo
-        driver.findElement(By.id("search_form_input_homepage")).clear(); //Limpiar el text box
-        driver.findElement(By.id("search_form_input_homepage")).sendKeys("tortellini al pesto"); //Escribir en el text box
-        driver.findElement(By.id("search_button_homepage")).click(); //click a la lupa.
+        driver.findElement(By.id("searchbox_input")).clear(); //Limpiar el text box
+        driver.findElement(By.id("searchbox_input")).sendKeys("tortellini al pesto"); //Escribir en el text box
+        driver.findElement(By.id("search_button_homepage")).click(); //click a la lupa. Va a petar porque el id del botón de búsqueda ha cambiado, pero es para mostrar la diferencia entre submit y click.
         Thread.sleep(2000); //Espera forzada
     }
 }
diff --git a/src/test/java/com/agile611/testng/webdriver/NavigationTest.java b/src/test/java/com/agile611/testng/webdriver/NavigationTest.java
index 7f525c8..4347a5b 100644
--- a/src/test/java/com/agile611/testng/webdriver/NavigationTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/NavigationTest.java
@@ -1,9 +1,8 @@
 package com.agile611.testng.webdriver;
 
-import org.openqa.selenium.By;
 import org.testng.annotations.Test;
 
-public class NavigationTest extends BaseSaucelabsTest {
+public class NavigationTest extends BaseTest {
     @Test //Opciones de Navegación
     public void testNavigation() throws Exception {
         driver.get("https://www.duckduckgo.com/"); //Navegar hasta duckduckgo
diff --git a/src/test/java/com/agile611/testng/webdriver/StatusCodesTest.java b/src/test/java/com/agile611/testng/webdriver/StatusCodesTest.java
index 1244824..7624d36 100644
--- a/src/test/java/com/agile611/testng/webdriver/StatusCodesTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/StatusCodesTest.java
@@ -1,5 +1,7 @@
 package com.agile611.testng.webdriver;
 
+import java.io.File;
+
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
@@ -7,8 +9,6 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.io.File;
-
 public class StatusCodesTest {
     WebDriver driver;
 
diff --git a/src/test/java/com/agile611/testng/webdriver/TestABTest.java b/src/test/java/com/agile611/testng/webdriver/TestABTest.java
index b0923b5..a7a1d87 100644
--- a/src/test/java/com/agile611/testng/webdriver/TestABTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/TestABTest.java
@@ -1,6 +1,5 @@
 package com.agile611.testng.webdriver;
 
-import com.agile611.testng.webdriver.BaseTest;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.testng.annotations.Test;
diff --git a/src/test/java/com/agile611/testng/webdriver/UploadTest.java b/src/test/java/com/agile611/testng/webdriver/UploadTest.java
index cfcd66a..3c4fc02 100644
--- a/src/test/java/com/agile611/testng/webdriver/UploadTest.java
+++ b/src/test/java/com/agile611/testng/webdriver/UploadTest.java
@@ -1,15 +1,14 @@
 package com.agile611.testng.webdriver;
 
+import java.io.File;
+import java.time.Duration;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.time.Duration;
-
 import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.Test;
 
 public class UploadTest extends BaseTest {
 
diff --git a/src/test/java/com/agile611/testng/webdriver/pages/ResultsPage.java b/src/test/java/com/agile611/testng/webdriver/pages/ResultsPage.java
index 9dfd64c..d4335bc 100644
--- a/src/test/java/com/agile611/testng/webdriver/pages/ResultsPage.java
+++ b/src/test/java/com/agile611/testng/webdriver/pages/ResultsPage.java
@@ -9,7 +9,7 @@ public class ResultsPage {
 
     private WebDriver driver;
 
-    @FindBy(id = "links_wrapper")
+    @FindBy(className = "react-results--main")
     public WebElement resultsList;
 
 
diff --git a/src/test/java/com/agile611/testng/webdriver/pages/SearchPage.java b/src/test/java/com/agile611/testng/webdriver/pages/SearchPage.java
index 8612915..383daa0 100644
--- a/src/test/java/com/agile611/testng/webdriver/pages/SearchPage.java
+++ b/src/test/java/com/agile611/testng/webdriver/pages/SearchPage.java
@@ -9,14 +9,9 @@ public class SearchPage {
 
     private WebDriver driver;
 
-    @FindBy(id = "search_form_input_homepage")
+    @FindBy(id = "searchbox_input")
     public WebElement searchBox;
 
-
-    @FindBy(id = "search_button_homepage")
-    public WebElement searchButton;
-
-
     public SearchPage(WebDriver driver) {
         PageFactory.initElements(driver, this);
         driver.get("https://duckduckgo.com/");
@@ -25,6 +20,6 @@ public class SearchPage {
     public void searchKeyword(String keyword) {
         searchBox.clear();
         searchBox.sendKeys(keyword);
-        searchButton.click();
+        searchBox.submit();
     }
-}
+}
\ No newline at end of file