diff --git a/e2e/cypress.json b/e2e/cypress.json
index cdf1173..73dbaf5 100644
--- a/e2e/cypress.json
+++ b/e2e/cypress.json
@@ -1,14 +1,14 @@
 {
-    "defaultCommandTimeout":10000,
+    "defaultCommandTimeout":5000,
     "integrationFolder": "tests",
     "supportFile":"support",
-    "baseUrl": "http://localhost:7575",
-    "xxxbaseUrl": "https://test.helloayanova.com",
-    "xxbaseUrl":"http://localhost:8080",   
+    "xbaseUrl": "http://localhost:7575",
+    "baseUrl": "https://test.helloayanova.com",
+    "xxxxbaseUrl":"http://localhost:8080",   
     "video":false,
     "env": {
-        "apiBaseUrl":"http://localhost:7575/api/v8.0/",
-        "xxapiBaseUrl":"https://test.helloayanova.com/api/v8.0/",
+        "xapiBaseUrl":"http://localhost:7575/api/v8.0/",
+        "apiBaseUrl":"https://test.helloayanova.com/api/v8.0/",
         "adminusername": "superuser",
         "adminpassword": "l3tm3in",
         "accountinguser": "Accounting",
diff --git a/e2e/support/commands.js b/e2e/support/commands.js
index da1ed00..398b319 100644
--- a/e2e/support/commands.js
+++ b/e2e/support/commands.js
@@ -26,16 +26,15 @@
 
 Cypress.Commands.add("chooseVSelect", (dataCyTag, selectionText) => {
   cy.get(`[data-cy='${dataCyTag}']`).click({ force: true });
-  cy.get(".v-list-item__title")    
+  cy.get(".v-list-item__title")
     .contains(new RegExp("^" + selectionText + "$", "g"))
     .click({ force: true });
 });
 
 Cypress.Commands.add("choosePickList", (dataCyTag, selectionText) => {
   cy.get(`[data-cy='${dataCyTag}']`).click({ force: true }).type(selectionText);
-
+  cy.wait(500);
   cy.get(".v-list-item__title")
-    //.contains(selectionText)
-    .contains(new RegExp("^" + selectionText + "$", "g"))
-    .click({ force: true });
+    .contains(new RegExp(selectionText))
+    .click();
 });
diff --git a/e2e/tests/regression/accounting-user/accounting-features.js b/e2e/tests/regression/accounting-user/accounting-features.js
index 702451d..050e2a7 100644
--- a/e2e/tests/regression/accounting-user/accounting-features.js
+++ b/e2e/tests/regression/accounting-user/accounting-features.js
@@ -94,7 +94,9 @@ describe("When Accounting user logs in", () => {
     cy.get("[data-cy=notes]").type(
       `Hello SuperUser this is my forward to you!{enter}eot{enter}`
     );
-    cy.get("[data-cy=pickListSelectedUserId]").click().type("SuperUser{downarrow}{enter}");
+    cy.get("[data-cy=pickListSelectedUserId]")
+      .click()
+      .type("SuperUser{downarrow}{enter}");
     cy.get("[data-cy='memo-edit:save'] > .v-btn__content").click();
 
     //REMINDERS
@@ -195,12 +197,6 @@ describe("When Accounting user logs in", () => {
     cy.contains("12 PM"); //just something to find in day view to confirm we made it there
     cy.contains(`${Cypress.config("cyid")}-test-review`);
 
-    //NOTIFICATION
-    cy.get("[data-cy=notification]").click();
-    cy.url().should("include", "/home-notifications");
-    cy.contains("Object created");
-    cy.contains(`${Cypress.config("cyid")}-test-contract`);
-
     //HISTORY
     cy.get("[data-cy=navicon]").click();
     cy.get("[data-cy='nav/home-history']").click();
@@ -247,7 +243,7 @@ describe("When Accounting user logs in", () => {
     );
     cy.get("[data-cy=charge]").type("2.00");
     cy.get("[data-cy=cost]").type("1.00");
-    cy.get("[data-cy=unit]").type("{downarrow}{enter}");//choose first in list
+    cy.get("[data-cy=unit]").type("{downarrow}{enter}"); //choose first in list
     cy.get("[data-cy=notes]").type(`Test trvl rate NOTES!!!{enter}eot{enter}`);
     cy.get("[data-cy='travel-rate-edit:save'] > .v-btn__content").click();
     cy.get("[data-cy=navicon]").click();
@@ -275,6 +271,12 @@ describe("When Accounting user logs in", () => {
     cy.url().should("include", "/acc-tax-codes");
     cy.contains(`${Cypress.config("cyid")}-test-tax-code`);
 
+    //NOTIFICATION
+    cy.get("[data-cy=notification]").click();
+    cy.url().should("include", "/home-notifications");
+    cy.contains("Object created");
+    cy.contains(`${Cypress.config("cyid")}-test-contract`);
+
     //LOGOUT
     cy.get("[data-cy=navicon]").click();
     cy.get("[data-cy=logout]").click();
diff --git a/e2e/tests/regression/service-user/service-user-create-workorder.js b/e2e/tests/regression/service-user/service-user-create-workorder.js
index e63f899..72761ed 100644
--- a/e2e/tests/regression/service-user/service-user-create-workorder.js
+++ b/e2e/tests/regression/service-user/service-user-create-workorder.js
@@ -125,7 +125,7 @@ describe("When Service user logs in", () => {
 
     //Unit
     cy.get("[data-cy=woItemHeader]").click();
-    cy.get("[data-cy=woItemAddUnit]").click();
+    cy.get("[data-cy=woItemAddUnit]").click({force:true});
     cy.choosePickList("units.unitId", "e2e");
     cy.get("[data-cy=woItemUnitGetWarrantyInfo]").click();
     cy.contains("Receipt Number:"); //just confirm it displayed something
@@ -163,8 +163,8 @@ describe("When Service user logs in", () => {
     cy.get("[data-cy=woItemPartAssemblyAdd]").click();
 
     //Labor
-    cy.get("[data-cy=woItemHeader]").click();
-    cy.get("[data-cy=woItemAddLabor]").click();
+    cy.get("[data-cy=woItemHeader]").click({force:true});
+    cy.get("[data-cy=woItemAddLabor]").click({force:true});
 
     cy.get("[data-cy='serviceStartDate:date']").type(
       dayjs().format("YYYY-MM-DD")