diff --git a/cypress.json b/cypress.json
index a7564dda0f15..27840c96436d 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,4 +1,4 @@
 {
     "video": false,
-    "baseUrl": "http://ninja.test:8000/"
+    "baseUrl": "http://invoiceninja.wip/"
 }
diff --git a/cypress/integration/client_portal/credits.spec.js b/cypress/integration/client_portal/credits.spec.js
index e2c2cc0ec5e5..184a0e25ca66 100644
--- a/cypress/integration/client_portal/credits.spec.js
+++ b/cypress/integration/client_portal/credits.spec.js
@@ -14,7 +14,7 @@ describe('Credits', () => {
         cy.visit('/client/credits');
 
         cy.get('body')
-            .find('h3')
+            .find('span')
             .first()
             .should('contain.text', 'Credits');
     });
diff --git a/cypress/integration/client_portal/invoices.spec.js b/cypress/integration/client_portal/invoices.spec.js
index cb7e309c5231..41d798874a3d 100644
--- a/cypress/integration/client_portal/invoices.spec.js
+++ b/cypress/integration/client_portal/invoices.spec.js
@@ -14,7 +14,7 @@ context('Invoices', () => {
         cy.visit('/client/invoices');
 
         cy.get('body')
-            .find('h3')
+            .find('span')
             .first()
             .should('contain.text', 'Invoices');
     });
diff --git a/cypress/integration/client_portal/login.spec.js b/cypress/integration/client_portal/login.spec.js
index 81ce5ebff781..3bb0c4e55ec1 100644
--- a/cypress/integration/client_portal/login.spec.js
+++ b/cypress/integration/client_portal/login.spec.js
@@ -39,7 +39,7 @@ context('Login', () => {
                             .click();
                         cy.location().should(location => {
                             expect(location.pathname).to.eq(
-                                '/client/dashboard'
+                                '/client/invoices'
                             );
                         });
                     });
diff --git a/cypress/integration/client_portal/payment_methods.spec.js b/cypress/integration/client_portal/payment_methods.spec.js
index 4b50c96e5e95..4c87e5547d04 100644
--- a/cypress/integration/client_portal/payment_methods.spec.js
+++ b/cypress/integration/client_portal/payment_methods.spec.js
@@ -14,20 +14,11 @@ context('Payment methods', () => {
         cy.visit('/client/payment_methods');
 
         cy.get('body')
-            .find('h3')
+            .find('span')
             .first()
             .should('contain.text', 'Payment Method');
     });
 
-    it('should show add payment method button', () => {
-        cy.visit('/client/payment_methods');
-
-        cy.get('body')
-            .find('a.button.button-primary')
-            .first()
-            .should('contain.text', 'Add Payment Method');
-    });
-
     it('should have per page options dropdown', () => {
         cy.visit('/client/payment_methods');
 
diff --git a/cypress/integration/client_portal/payments.spec.js b/cypress/integration/client_portal/payments.spec.js
index 9db3c931c3c3..b00aea77593d 100644
--- a/cypress/integration/client_portal/payments.spec.js
+++ b/cypress/integration/client_portal/payments.spec.js
@@ -14,7 +14,7 @@ context('Payments', () => {
         cy.visit('/client/payments');
 
         cy.get('body')
-            .find('h3')
+            .find('span')
             .first()
             .should('contain.text', 'Payments');
     });
diff --git a/cypress/integration/client_portal/quotes.spec.js b/cypress/integration/client_portal/quotes.spec.js
index 8627065fccf6..2b2918e48149 100644
--- a/cypress/integration/client_portal/quotes.spec.js
+++ b/cypress/integration/client_portal/quotes.spec.js
@@ -14,7 +14,7 @@ describe('Quotes', () => {
         cy.visit('/client/quotes');
 
         cy.get('body')
-            .find('h3')
+            .find('span')
             .first()
             .should('contain.text', 'Quotes');
     });
diff --git a/cypress/integration/client_portal/recurring_invoices.spec.js b/cypress/integration/client_portal/recurring_invoices.spec.js
index 5271c8e24541..91e24f14d5cb 100644
--- a/cypress/integration/client_portal/recurring_invoices.spec.js
+++ b/cypress/integration/client_portal/recurring_invoices.spec.js
@@ -16,7 +16,7 @@ context('Recurring invoices', () => {
     it('should show reucrring invoices text', () => {
         cy.visit('/client/recurring_invoices');
 
-        cy.get('h3')
+        cy.get('span')
             .first()
             .should('contain.text', 'Recurring Invoices');
     });
diff --git a/package.json b/package.json
index 07c4ddf4d58c..b53a71fe307b 100644
--- a/package.json
+++ b/package.json
@@ -8,13 +8,15 @@
         "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "test": "cypress run"
+        "test": "cypress run",
+        "test:gui": "cypress open"
     },
     "devDependencies": {
         "@babel/compat-data": "7.9.0",
         "@babel/plugin-proposal-class-properties": "^7.10.1",
         "laravel-mix-purgecss": "^5.0.0-rc.1",
-        "vue-template-compiler": "^2.6.11"
+        "vue-template-compiler": "^2.6.11",
+        "cypress": "^4.6.0",
     },
     "dependencies": {
         "@tailwindcss/ui": "^0.1.3",
@@ -22,7 +24,6 @@
         "card-js": "^1.0.13",
         "card-validator": "^6.2.0",
         "cross-env": "^7.0",
-        "cypress": "^4.6.0",
         "jsignature": "^2.1.3",
         "laravel-mix": "^5.0.1",
         "lodash": "^4.17.13",