diff --git a/e2e/support/index.js b/e2e/support/index.js
index b79ccf0..cd79088 100644
--- a/e2e/support/index.js
+++ b/e2e/support/index.js
@@ -24,22 +24,22 @@ Cypress.config("cyid", `cy${new Date().getTime()}`);
 
 
 //Generate fresh data
-before(() => {
-  cy.visit("/login");
+// before(() => {
+//   cy.visit("/login");
 
-  cy.get("input[name=username]").clear().type(Cypress.env("adminusername"));
+//   cy.get("input[name=username]").clear().type(Cypress.env("adminusername"));
 
-  // {enter} causes the form to submit
-  cy.get("input[name=password]")
-    .clear()
-    .type(`${Cypress.env("adminpassword")}{enter}`);
-  cy.url().should("include", "/ay-evaluate");
+//   // {enter} causes the form to submit
+//   cy.get("input[name=password]")
+//     .clear()
+//     .type(`${Cypress.env("adminpassword")}{enter}`);
+//   cy.url().should("include", "/ay-evaluate");
 
-  cy.get("[data-cy=btnSeed]").click();
-  cy.get("[data-cy=btnStart]").click();
-  cy.get('[data-cy="gzconfirm:yesbutton"]').click();
-  //cy.contains("permanently erase");
-  cy.get('[data-cy="gzconfirm:yesbutton"]').click();
-//long delay here while data is being generated
-  cy.url({timeout:300000}).should("include", "/login");
-});
+//   cy.get("[data-cy=btnSeed]").click();
+//   cy.get("[data-cy=btnStart]").click();
+//   cy.get('[data-cy="gzconfirm:yesbutton"]').click();
+//   //cy.contains("permanently erase");
+//   cy.get('[data-cy="gzconfirm:yesbutton"]').click();
+// //long delay here while data is being generated
+//   cy.url({timeout:300000}).should("include", "/login");
+// });
diff --git a/e2e/tests/regression/service-user/service-user-features.js b/e2e/tests/regression/service-user/service-user-features.js
index 3b74eae..06c6f5a 100644
--- a/e2e/tests/regression/service-user/service-user-features.js
+++ b/e2e/tests/regression/service-user/service-user-features.js
@@ -35,6 +35,11 @@ describe("When Service user logs in", () => {
     );
     cy.get("[data-cy='project-edit:save'] > .v-btn__content").click();
 
+    //    cy.url().should('not.contain','/svc-projects/0');
+    // cy.intercept("get", "/svc-projects/").as('getNewProject');
+    // cy.wait("@getNewProject");
+    //  cy.pause();
+
     //WORKORDER
     cy.get("[data-cy=navicon]").click();
     // cy.get("[data-cy=service]").click(); //only if not setting project above
@@ -106,7 +111,7 @@ describe("When Service user logs in", () => {
     //Unit
     cy.get("[data-cy=woItemHeader]").click();
     cy.get("[data-cy=woItemAddUnit]").click();
-    cy.choosePickList("units.unitId", "zone1"); //this works but is indeterminate so there must be a zone 1 unit which usually seems to be the case
+    cy.choosePickList("units.unitId", "zone"); //this works but is indeterminate so there must be a zoneX  unit which usually seems to be the case
     cy.get("[data-cy=woItemUnitGetWarrantyInfo]").click();
     cy.contains("Receipt Number:"); //just confirm it displayed something
     cy.get("[data-cy=unitUnitNotes]").type(`cywoitemunitnotes`);
@@ -123,7 +128,7 @@ describe("When Service user logs in", () => {
     cy.get("[data-cy='stopDate:time']").type(
       dayjs().add(1, "hour").format("HH:mm")
     );
-    cy.choosePickList("scheduledUsers.userid", "Tech");
+    cy.choosePickList("scheduledUsers.userid", "TechRestricted");
     cy.choosePickList("scheduledUsers.serviceRateId", "zone");
 
     //Task
@@ -140,16 +145,26 @@ describe("When Service user logs in", () => {
 
     cy.get("[data-cy=woItemPartsHeader]").click();
     cy.get("[data-cy=woItemPartAssemblySelect]").click();
-    cy.choosePickList("selectedPartAssembly", "zone");
+    cy.choosePickList("selectedPartAssembly", "asm");
     cy.get("[data-cy=woItemPartAssemblyAdd]").click();
 
     //Save
-    cy.get("[data-cy='workorder-edit:save'] > .v-btn__content").click({
-      force: true
-    });
-
+    cy.get("[data-cy=notes]").type(` eot.`); //make dirty again, for some reason when get here dirty seems to go away 
+    cy.get("[data-cy='workorder-edit:save'] > .v-btn__content").click();
+    cy.contains(
+      "These are alert notes displayed on workorders about this GOLD contract"
+    );
+   
+    //wait for save, workorder save can take forever due to all the separate posts
+    //this will ensure it no matter how long it takes up to the timeout period it will wait
+    //for non-zero path
+    cy.location("pathname", { timeout: 20000 }).should(
+      "not.eq",
+      "/svc-workorders/0"
+    );
+   
     //LOGOUT
-    cy.get("[data-cy=navicon]").click();
+    cy.get("[data-cy=navicon]").click(); //{force:true}
     cy.get("[data-cy=logout]").click();
     cy.url().should("include", "/login");