diff --git a/FullstackProsjekt/cypress/e2e/login.cy.js b/FullstackProsjekt/cypress/e2e/login.cy.js
index 6fc010d469987d89afd9cfb20cae9bedf9130988..701f8a5c7d6de70005a772df44bc644d1f3dc2fb 100644
--- a/FullstackProsjekt/cypress/e2e/login.cy.js
+++ b/FullstackProsjekt/cypress/e2e/login.cy.js
@@ -17,7 +17,6 @@ describe('Login Component', () => {
     cy.get('input[type="password"]').type('invalidPassword')
     cy.get('input[type="submit"]').click()
 
-    cy.wait('@loginRequest')
 
     cy.get('.error-message').should('contain', 'Error logging in, try again')
   })
@@ -28,7 +27,6 @@ describe('Login Component', () => {
     cy.get('input[type="password"]').type('123')
     cy.get('input[type="submit"]').click()
 
-    cy.wait('@loginRequest')
 
     cy.url().should('include', '/profile')
   })
diff --git a/FullstackProsjekt/cypress/e2e/signup.cy.js b/FullstackProsjekt/cypress/e2e/signup.cy.js
index 3136025f769f64fe393d94587505da6c8153eb0c..a2b082bedbc9197decc320e60e94546f564ef1ea 100644
--- a/FullstackProsjekt/cypress/e2e/signup.cy.js
+++ b/FullstackProsjekt/cypress/e2e/signup.cy.js
@@ -1,5 +1,6 @@
 describe('Signup Component', () => {
   beforeEach(() => {
+    // Assuming your signup page route is '/signup'
     cy.visit('http://localhost:5173/signup')
   })
 
@@ -11,32 +12,31 @@ describe('Signup Component', () => {
   })
 
   it('should show error message for invalid signup', () => {
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/auth/register',
-      status: 400,
-      response: { message: 'Username already exists' }
+    cy.intercept('POST', '/auth/register', {
+      statusCode: 400,
+      body: { message: 'Username already exists' }
     }).as('signupRequest')
 
-    cy.get('input[type="text"]').type('existingUsername')
-    cy.get('input[type="password"]').type('password')
+    cy.get('input[type="text"]').type('123')
+    cy.get('input[type="password"]').eq(0).type('password') 
+    cy.get('input[type="password"]').eq(1).type('password') 
     cy.get('.submit-btn').click()
 
-    cy.wait('@signupRequest')
 
     cy.get('.error-message').should('contain', 'Error signing up, try again')
   })
 
   it('should redirect to login page on successful signup', () => {
-    cy.server()
-    cy.route('POST', '/auth/register', {}).as('signupRequest')
+    cy.intercept('POST', '/auth/register', {
+      statusCode: 200,
+      body: {}
+    }).as('signupRequest')
 
-    cy.get('input[type="text"]').type('newUsername')
-    cy.get('input[type="password"]').type('password')
+    cy.get('input[type="text"]').type('Banan')
+    cy.get('input[type="password"]').eq(0).type('password')
+    cy.get('input[type="password"]').eq(1).type('password')
     cy.get('.submit-btn').click()
 
-    cy.wait('@signupRequest')
 
     cy.url().should('include', '/login')
   })
diff --git a/FullstackProsjekt/src/frontend/cypress/e2e/login.cy.js b/FullstackProsjekt/src/frontend/cypress/e2e/login.cy.js
index 4bb88bce815419f36f61eb8c09c101d35f141124..589430eb873f8868732cdeb722f57b6c95f8dbba 100644
--- a/FullstackProsjekt/src/frontend/cypress/e2e/login.cy.js
+++ b/FullstackProsjekt/src/frontend/cypress/e2e/login.cy.js
@@ -17,7 +17,6 @@ describe('Login Component', () => {
         cy.get('input[type="password"]').type('invalidPassword')
         cy.get('input[type="submit"]').click()
 
-        cy.wait('@loginRequest')
 
         cy.get('.error-message').should('contain', 'Error logging in, try again')
     })
@@ -28,7 +27,6 @@ describe('Login Component', () => {
         cy.get('input[type="password"]').type('123')
         cy.get('input[type="submit"]').click()
 
-        cy.wait('@loginRequest')
 
         cy.url().should('include', '/profile')
     })
diff --git a/FullstackProsjekt/src/frontend/cypress/e2e/signup.cy.js b/FullstackProsjekt/src/frontend/cypress/e2e/signup.cy.js
index def6121c427b47223748d781c9e7aa3bfb3b5f1b..bea5d121415d73b033d5ab1cea4dc97000b86024 100644
--- a/FullstackProsjekt/src/frontend/cypress/e2e/signup.cy.js
+++ b/FullstackProsjekt/src/frontend/cypress/e2e/signup.cy.js
@@ -1,5 +1,6 @@
 describe('Signup Component', () => {
     beforeEach(() => {
+        // Assuming your signup page route is '/signup'
         cy.visit('http://localhost:5173/signup')
     })
 
@@ -11,32 +12,31 @@ describe('Signup Component', () => {
     })
 
     it('should show error message for invalid signup', () => {
-        cy.server()
-        cy.route({
-            method: 'POST',
-            url: '/auth/register',
-            status: 400,
-            response: { message: 'Username already exists' }
+        cy.intercept('POST', '/auth/register', {
+            statusCode: 400,
+            body: { message: 'Username already exists' }
         }).as('signupRequest')
 
-        cy.get('input[type="text"]').type('existingUsername')
-        cy.get('input[type="password"]').type('password')
+        cy.get('input[type="text"]').type('123')
+        cy.get('input[type="password"]').eq(0).type('password')
+        cy.get('input[type="password"]').eq(1).type('password')
         cy.get('.submit-btn').click()
 
-        cy.wait('@signupRequest')
 
         cy.get('.error-message').should('contain', 'Error signing up, try again')
     })
 
     it('should redirect to login page on successful signup', () => {
-        cy.server()
-        cy.route('POST', '/auth/register', {}).as('signupRequest')
+        cy.intercept('POST', '/auth/register', {
+            statusCode: 200,
+            body: {}
+        }).as('signupRequest')
 
-        cy.get('input[type="text"]').type('newUsername')
-        cy.get('input[type="password"]').type('password')
+        cy.get('input[type="text"]').type('Banan')
+        cy.get('input[type="password"]').eq(0).type('password')
+        cy.get('input[type="password"]').eq(1).type('password')
         cy.get('.submit-btn').click()
 
-        cy.wait('@signupRequest')
 
         cy.url().should('include', '/login')
     })