diff --git a/browser-domain/src/components/Landing/Landing.tsx b/browser-domain/src/components/Landing/Landing.tsx
index 7c7918d..f257991 100644
--- a/browser-domain/src/components/Landing/Landing.tsx
+++ b/browser-domain/src/components/Landing/Landing.tsx
@@ -21,14 +21,14 @@ const LandingPage: React.FC = () => {
             </p>
             <div className="ButtonContainer">
                 <Link to="/login" className="StyledLink">
-                    <button className="StyledButton" onClick={handleSubscribeClick}>Create an Account</button>
+                    <button name="CreateAccount" className="StyledButton" onClick={handleSubscribeClick}>Create an Account</button>
                 </Link>
             </div>
             <p className="Description">
                 Otherwise, you can continue to the flights page.
             </p>
             <div className="ButtonContainer">
-                <button className="StyledButton" onClick={handleGoToFlightsClick}>
+                <button name="GoToFlights" className="StyledButton" onClick={handleGoToFlightsClick}>
                     Go to Flights
                 </button>
             </div>
diff --git a/browser-domain/src/components/LogIn/LogIn.tsx b/browser-domain/src/components/LogIn/LogIn.tsx
index 6cb3b33..3f19968 100644
--- a/browser-domain/src/components/LogIn/LogIn.tsx
+++ b/browser-domain/src/components/LogIn/LogIn.tsx
@@ -18,7 +18,7 @@ export const LogIn = () => {
         <div className="Box Small">
             <div className="Section">
                 <div className="Section">
-                    <h2>Welcome to FIDS!</h2>
+                    <h2>Login</h2>
                     <Input
                         placeholder="User"
                         name="User"
diff --git a/testing/catcher/resources/create-flight.js b/testing/catcher/resources/create-flight.js
index 7b96510..e757c24 100644
--- a/testing/catcher/resources/create-flight.js
+++ b/testing/catcher/resources/create-flight.js
@@ -15,6 +15,12 @@ async function validLogin() {
     try {
         await driver.get(process.env.site_url);
 
+        await driver.wait(until.elementLocated(By.xpath("//h1[text()='Welcome to FIDS!']", 5000)))
+
+        await driver.wait(until.elementLocated(By.name('CreateAccount'), 5000))
+
+        await driver.findElement(By.name('CreateAccount')).click();
+
         await driver.findElement(By.name('User'))
             .sendKeys('info@lufthansa.com');
         await driver.findElement(By.name('Password'))
@@ -22,8 +28,6 @@ async function validLogin() {
 
         await driver.findElement(By.name('Login')).click();
 
-        await driver.wait(until.elementLocated(By.xpath("//h2[text()='Flights']", 5000)))
-
         await driver.wait(until.elementLocated(By.name('CreateFlight'), 5000))
 
         await driver.findElement(By.name('CreateFlight')).click();
@@ -68,9 +72,9 @@ async function validLogin() {
 
         await driver.findElement(By.name('CreateFlightButton')).click();
 
-        await driver.wait(until.elementLocated(By.xpath("//h2[text()='Flights']", 5000)))
+        await driver.wait(until.elementLocated(By.name('CreateFlight'), 5000))
 
-        let actualUrl = process.env.site_url + "/home?page=1";
+        let actualUrl = process.env.site_url + "/flights?page=1";
         let expectedUrl = await driver.getCurrentUrl();
         assert.equal(actualUrl, expectedUrl);
 
diff --git a/testing/catcher/resources/login.js b/testing/catcher/resources/login.js
index 2ab804b..d1ddd04 100644
--- a/testing/catcher/resources/login.js
+++ b/testing/catcher/resources/login.js
@@ -13,7 +13,9 @@ async function validLogin() {
         .build();
 
     try {
-        await driver.get(process.env.site_url);
+        await driver.get(process.env.site_url + "/login");
+
+        await driver.wait(until.elementLocated(By.xpath("//h2[text()='Login']", 5000)))
 
         await driver.findElement(By.name('User'))
             .sendKeys('info@lufthansa.com');
@@ -25,9 +27,9 @@ async function validLogin() {
         let title = await driver.getTitle();
         assert.equal("Airport browser", title);
 
-        await driver.wait(until.elementLocated(By.xpath("//h2[text()='Flights']", 5000)))
+        await driver.wait(until.elementLocated(By.name('CreateFlight'), 5000))
 
-        let actualUrl = process.env.site_url + "/home?page=1";
+        let actualUrl = process.env.site_url + "/flights?page=1";
         let expectedUrl = await driver.getCurrentUrl();
         assert.equal(actualUrl, expectedUrl);
 
diff --git a/testing/catcher/resources/signup.js b/testing/catcher/resources/signup.js
index b872e8b..fce14cf 100644
--- a/testing/catcher/resources/signup.js
+++ b/testing/catcher/resources/signup.js
@@ -15,6 +15,16 @@ async function validLogin() {
     try {
         await driver.get(process.env.site_url);
 
+        await driver.wait(until.elementLocated(By.xpath("//h1[text()='Welcome to FIDS!']", 5000)))
+
+        await driver.wait(until.elementLocated(By.name('CreateAccount'), 5000))
+
+        await driver.findElement(By.name('CreateAccount')).click();
+
+        await driver.wait(until.urlIs(process.env.site_url + "/login"));
+
+        await driver.wait(until.elementLocated(By.name('Signup'), 5000))
+        
         await driver.findElement(By.name('Signup')).click();
 
         await driver.wait(until.urlIs(process.env.site_url + "/signup"));
@@ -32,9 +42,9 @@ async function validLogin() {
 
         await driver.findElement(By.name('Signup')).click();
 
-        await driver.wait(until.elementLocated(By.xpath("//h2[text()='Flights']", 5000)))
+        await driver.wait(until.elementLocated(By.name('searchInput'), 5000))
 
-        let actualUrl = process.env.site_url + "/home?page=1";
+        let actualUrl = process.env.site_url + "/flights?page=1";
         let expectedUrl = await driver.getCurrentUrl();
         assert.equal(actualUrl, expectedUrl);
 
diff --git a/testing/catcher/test.sh b/testing/catcher/test.sh
index beb25a2..840b8c0 100644
--- a/testing/catcher/test.sh
+++ b/testing/catcher/test.sh
@@ -1,7 +1,3 @@
-#!/bin/bash
+#!/bin/bash -e
 
-catcher -i inventories/local.yaml tests/login.test.yaml
-catcher -i inventories/local.yaml tests/create-flight.test.yaml
-catcher -i inventories/local.yaml tests/signup.test.yaml
-catcher -i inventories/local.yaml tests/auth.test.yaml
-# catcher tests
+catcher -i inventories/local.yaml tests
diff --git a/testing/tavern/test.sh b/testing/tavern/test.sh
index 7583b45..f5c6e34 100644
--- a/testing/tavern/test.sh
+++ b/testing/tavern/test.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/bash -e
 
 tavern-ci *.yaml