diff --git a/e2e/tests/regression/service-user/service-user-features.js b/e2e/tests/regression/service-user/service-user-features.js
index 06c6f5a..2d7efd4 100644
--- a/e2e/tests/regression/service-user/service-user-features.js
+++ b/e2e/tests/regression/service-user/service-user-features.js
@@ -35,11 +35,7 @@ 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
@@ -53,22 +49,22 @@ describe("When Service user logs in", () => {
     cy.chooseVSelect("woState:picker", "Scheduled");
     cy.get("[data-cy='woState:btnok']").click();
 
-    //Address;
-    cy.get("[data-cy='woAddress:open']").click();
-    cy.get("[data-cy=address]").type(
-      `${Cypress.config("cyid")} E. First St{enter}`
-    );
-    cy.get("[data-cy=city]").type("Los Angeles");
-    cy.get("[data-cy=region]").type("California");
-    cy.get("[data-cy=country]").type("USA");
-    cy.get("[data-cy=latitude]").type("34.052234");
-    cy.get("[data-cy=longitude]").type("-118.243685");
-    cy.get("[data-cy=postAddress]").type(`Box ${Cypress.config("cyid")}`);
-    cy.get("[data-cy=postCity]").type("Los Angeles");
-    cy.get("[data-cy=postRegion]").type("CA");
-    cy.get("[data-cy=postCountry]").type("US");
-    cy.get("[data-cy=postCode]").type("90012");
-    cy.get("[data-cy='woAddress:btnok']").click();
+    // //Address;
+    // cy.get("[data-cy='woAddress:open']").click();
+    // cy.get("[data-cy=address]").type(
+    //   `${Cypress.config("cyid")} E. First St{enter}`
+    // );
+    // cy.get("[data-cy=city]").type("Los Angeles");
+    // cy.get("[data-cy=region]").type("California");
+    // cy.get("[data-cy=country]").type("USA");
+    // cy.get("[data-cy=latitude]").type("34.052234");
+    // cy.get("[data-cy=longitude]").type("-118.243685");
+    // cy.get("[data-cy=postAddress]").type(`Box ${Cypress.config("cyid")}`);
+    // cy.get("[data-cy=postCity]").type("Los Angeles");
+    // cy.get("[data-cy=postRegion]").type("CA");
+    // cy.get("[data-cy=postCountry]").type("US");
+    // cy.get("[data-cy=postCode]").type("90012");
+    // cy.get("[data-cy='woAddress:btnok']").click();
 
     cy.get("[data-cy=notes]").type(`Test summary workorder information`);
     cy.get("[data-cy='completeByDate:date']").type(
@@ -81,22 +77,22 @@ describe("When Service user logs in", () => {
     cy.choosePickList("projectId", `${Cypress.config("cyid")}-test-project`);
     cy.get("[data-cy='serviceDate:date']").type(dayjs().format("YYYY-MM-DD"));
     cy.get("[data-cy='serviceDate:time']").type(dayjs().format("HH:mm"));
-    cy.get("[data-cy=customerContactName]").type(`Jayne Smith`);
-    cy.get("[data-cy=customerReferenceNumber]").type(
-      `cref-${Cypress.config("cyid")}`
-    );
-    cy.get("[data-cy=internalReferenceNumber]").type(
-      `intref-${Cypress.config("cyid")}`
-    );
-    cy.get("[data-cy=tags]").click().type("zone1{enter}"); //select some tags
-    cy.get("[data-cy=tags]").click().type("blue{enter}");
-    cy.get("[data-cy=tags]").click().type("jade{enter}");
-    cy.get("[data-cy=wiki] > div > .v-btn").click();
-    cy.get("[data-cy=wikiDesignView]").click();
-    cy.get("[data-cy=wikiEditor]").type(
-      "# Heading 1st level {enter}## Heading 2nd level{enter} ### Heading 3rd level{enter}#### 😀⚽🏒🍕🚗☀❤😎"
-    );
-    cy.get("[data-cy=wiki] > :nth-child(1) > .v-btn").click();
+    // cy.get("[data-cy=customerContactName]").type(`Jayne Smith`);
+    // cy.get("[data-cy=customerReferenceNumber]").type(
+    //   `cref-${Cypress.config("cyid")}`
+    // );
+    // cy.get("[data-cy=internalReferenceNumber]").type(
+    //   `intref-${Cypress.config("cyid")}`
+    // );
+    // cy.get("[data-cy=tags]").click().type("zone1{enter}"); //select some tags
+    // cy.get("[data-cy=tags]").click().type("blue{enter}");
+    // cy.get("[data-cy=tags]").click().type("jade{enter}");
+    // cy.get("[data-cy=wiki] > div > .v-btn").click();
+    // cy.get("[data-cy=wikiDesignView]").click();
+    // cy.get("[data-cy=wikiEditor]").type(
+    //   "# Heading 1st level {enter}## Heading 2nd level{enter} ### Heading 3rd level{enter}#### 😀⚽🏒🍕🚗☀❤😎"
+    // );
+    // cy.get("[data-cy=wiki] > :nth-child(1) > .v-btn").click();
 
     //Item
     cy.get("[data-cy=woItemHeader]").click();
@@ -108,53 +104,68 @@ describe("When Service user logs in", () => {
     cy.choosePickList("workOrderItemStatusId", "Item scheduled");
     cy.choosePickList("workOrderItemPriorityId", "One week");
 
-    //Unit
-    cy.get("[data-cy=woItemHeader]").click();
-    cy.get("[data-cy=woItemAddUnit]").click();
-    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`);
+    // //Unit
+    // cy.get("[data-cy=woItemHeader]").click();
+    // cy.get("[data-cy=woItemAddUnit]").click();
+    // 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`);
 
-    //Scheduled User
-    cy.get("[data-cy=woItemHeader]").click();
-    cy.get("[data-cy=woItemAddScheduledUser]").click();
+    // //Scheduled User
+    // cy.get("[data-cy=woItemHeader]").click();
+    // cy.get("[data-cy=woItemAddScheduledUser]").click();
 
-    cy.get("[data-cy='startDate:date']").type(dayjs().format("YYYY-MM-DD"));
-    cy.get("[data-cy='startDate:time']").type(dayjs().format("HH:mm"));
-    cy.get("[data-cy='stopDate:date']").type(
+    // cy.get("[data-cy='startDate:date']").type(dayjs().format("YYYY-MM-DD"));
+    // cy.get("[data-cy='startDate:time']").type(dayjs().format("HH:mm"));
+    // cy.get("[data-cy='stopDate:date']").type(
+    //   dayjs().add(1, "hour").format("YYYY-MM-DD")
+    // );
+    // cy.get("[data-cy='stopDate:time']").type(
+    //   dayjs().add(1, "hour").format("HH:mm")
+    // );
+    // cy.choosePickList("scheduledUsers.userid", "TechRestricted");
+    // cy.choosePickList("scheduledUsers.serviceRateId", "zone");
+
+    // //Task
+    // cy.get("[data-cy=woItemHeader]").click();
+    // cy.get("[data-cy=woItemAddTask]").click();
+    // cy.get("[data-cy=woItemTasksHeader]").click();
+    // cy.get("[data-cy=woItemTaskGroupSelect]").click();
+    // cy.choosePickList("selectedTaskGroup", "Aerostat");
+    // cy.get("[data-cy=woItemTaskGroupAdd]").click();
+
+    // //Part
+    // cy.get("[data-cy=woItemHeader]").click();
+    // cy.get("[data-cy=woItemAddPart]").click();
+    // cy.get("[data-cy=woItemPartsHeader]").click();
+    // cy.get("[data-cy=woItemPartAssemblySelect]").click();
+    // cy.choosePickList("selectedPartAssembly", "asm");
+    // cy.get("[data-cy=woItemPartAssemblyAdd]").click();
+
+    //Labor
+    cy.get("[data-cy=woItemHeader]").click();
+    cy.get("[data-cy=woItemAddLabor]").click();
+
+    cy.get("[data-cy='serviceStartDate:date']").type(dayjs().format("YYYY-MM-DD"));
+    cy.get("[data-cy='serviceStartDate:time']").type(dayjs().format("HH:mm"));
+    cy.get("[data-cy='serviceStopDate:date']").type(
       dayjs().add(1, "hour").format("YYYY-MM-DD")
     );
-    cy.get("[data-cy='stopDate:time']").type(
+    cy.get("[data-cy='serviceStopDate:time']").type(
       dayjs().add(1, "hour").format("HH:mm")
     );
-    cy.choosePickList("scheduledUsers.userid", "TechRestricted");
-    cy.choosePickList("scheduledUsers.serviceRateId", "zone");
-
-    //Task
-    cy.get("[data-cy=woItemHeader]").click();
-    cy.get("[data-cy=woItemAddTask]").click();
-    cy.get("[data-cy=woItemTasksHeader]").click();
-    cy.get("[data-cy=woItemTaskGroupSelect]").click();
-    cy.choosePickList("selectedTaskGroup", "Aerostat");
-    cy.get("[data-cy=woItemTaskGroupAdd]").click();
-
-    //Part
-    cy.get("[data-cy=woItemHeader]").click();
-    cy.get("[data-cy=woItemAddPart]").click();
-
-    cy.get("[data-cy=woItemPartsHeader]").click();
-    cy.get("[data-cy=woItemPartAssemblySelect]").click();
-    cy.choosePickList("selectedPartAssembly", "asm");
-    cy.get("[data-cy=woItemPartAssemblyAdd]").click();
-
+    cy.choosePickList("labors.userid", "TechRestricted");
+    cy.choosePickList("labors.serviceRateId", "zone");
+    cy.get('[data-cy=laborserviceDetails]').type("test details");
+    //-------------------------------
     //Save
-    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=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
@@ -162,11 +173,11 @@ describe("When Service user logs in", () => {
       "not.eq",
       "/svc-workorders/0"
     );
-   
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click(); //{force:true}
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
+
+    // //LOGOUT
+    // cy.get("[data-cy=navicon]").click(); //{force:true}
+    // cy.get("[data-cy=logout]").click();
+    // cy.url().should("include", "/login");
 
     //END OF TEST
     //-----------------------------------------------------