diff --git a/frontend/cypress/e2e/modifyOrder.cy.js b/frontend/cypress/e2e/modifyOrder.cy.js
index 24f54b824..1349e7253 100644
--- a/frontend/cypress/e2e/modifyOrder.cy.js
+++ b/frontend/cypress/e2e/modifyOrder.cy.js
@@ -15,7 +15,6 @@ before("login", () => {
 
 //"Modify Order search by accession Number", is a WIP.
 
-
 describe("Modify Order search by patient ", function () {
   it("User Visits Home Page and goes to Modify Order Page ", function () {
     homePage = loginPage.goToHomePage();
@@ -46,14 +45,14 @@ describe("Modify Order search by patient ", function () {
     modifyOrderPage.generateLabOrderNumber();
     cy.fixture("Order").then((order) => {
       orderEntityPage.searchRequester(order.requester);
-      cy.wait(4000);
+      orderEntityPage.requesterFName(order.requesterFName);
+      orderEntityPage.requesterLName(order.requesterLName);
       orderEntityPage.enterSiteName(order.siteName);
     });
   });
 
   it("Result Reporting and Submit Order", function () {
     modifyOrderPage.checkPatientEmail();
-    modifyOrderPage.checkRequesterSms();
     modifyOrderPage.clickSubmitButton();
   });
 });
diff --git a/frontend/cypress/fixtures/Order.json b/frontend/cypress/fixtures/Order.json
index 746d86d4b..1cf52bf23 100644
--- a/frontend/cypress/fixtures/Order.json
+++ b/frontend/cypress/fixtures/Order.json
@@ -8,7 +8,9 @@
   "specimen": "Conventional Smear",
   "smear": "Cervix",
   "siteName": "279 - CAMES MAN",
-  "requester": "Prime, Optimus",
+  "requester": "Prime Optimus",
+  "requesterFName": "Prime",
+  "requesterLName": "Optimus",
   "labNo": "DEV012001",
   "invalidLabNo": "DEV0124000000000000"
 }
diff --git a/frontend/cypress/pages/ModifyOrderPage.js b/frontend/cypress/pages/ModifyOrderPage.js
index 22f0d4e24..9772a0d2a 100644
--- a/frontend/cypress/pages/ModifyOrderPage.js
+++ b/frontend/cypress/pages/ModifyOrderPage.js
@@ -19,17 +19,16 @@ class ModifyOrderPage {
       .click();
   }
 
-  generateLabOrderNumber(){
+  generateLabOrderNumber() {
     //cy.get("#generate").should("have.class", "cds--link").click();
     cy.get("#generate", { timeout: 10000 }).should("be.visible").click();
-
   }
 
-  selectSerum(){
+  selectSerum() {
     cy.get("#sampleId_0").select("Serum");
   }
   clickRejectSample() {
-    cy.get("#reject_0").check({force: true} );
+    cy.get("#reject_0").check({ force: true });
   }
 
   rejectReason() {
@@ -40,13 +39,12 @@ class ModifyOrderPage {
     return cy.get("#additionalQuestionsSelect").should("be.disabled");
   }
 
-  checkPatientEmail(){
-    cy.get("#patientEmail_0_1", {timeout:10000}).should("be.visible").check({force:true});
+  checkPatientEmail() {
+    cy.get("#patientEmail_0_1", { timeout: 10000 })
+      .should("be.visible")
+      .check({ force: true });
   }
 
-  checkRequesterSms(){
-    cy.get("#providerSMS_0_1", {timeout:10000}).check({fore:true});
-  }
   assignValues() {
     cy.get(
       ":nth-child(1) > :nth-child(4) > .cds--form-item > .cds--checkbox-label",
diff --git a/frontend/cypress/pages/OrderEntityPage.js b/frontend/cypress/pages/OrderEntityPage.js
index 813b29837..ed79c03d0 100644
--- a/frontend/cypress/pages/OrderEntityPage.js
+++ b/frontend/cypress/pages/OrderEntityPage.js
@@ -48,10 +48,20 @@ class OrderEntityPage {
     cy.enterText("input#siteName", siteName);
   }
   searchRequester(requester) {
-    cy.enterText("input#requesterId", requester);
+    cy.get("input#requesterId").type(requester);
+  }
+
+  requesterFName(requesterFName) {
+    cy.get("input#requesterFirstName").type(requesterFName);
+  }
+
+  requesterLName(requesterLName) {
+    cy.get("input#requesterLastName").type(requesterLName);
   }
   clickSubmitOrderButton() {
-    cy.get("button.forwardButton.cds--btn--primary").click();
+    cy.get("button.forwardButton.cds--btn--primary")
+      .should("be.visible")
+      .click();
   }
 }