diff --git a/e2e/support/index.js b/e2e/support/index.js
index 9db50e0..b79ccf0 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");
 });