diff --git a/cypress/e2e/boilerplate.cy.js b/cypress/e2e/boilerplate-e2e/boilerplate.cy.js
similarity index 100%
rename from cypress/e2e/boilerplate.cy.js
rename to cypress/e2e/boilerplate-e2e/boilerplate.cy.js
diff --git a/cypress/e2e/category.cy.js b/cypress/e2e/boilerplate-e2e/category.cy.js
similarity index 97%
rename from cypress/e2e/category.cy.js
rename to cypress/e2e/boilerplate-e2e/category.cy.js
index 4683d251..46a85126 100644
--- a/cypress/e2e/category.cy.js
+++ b/cypress/e2e/boilerplate-e2e/category.cy.js
@@ -76,7 +76,9 @@ describe("Create a new category", () => {
     });
     cy.wait("@editCategory");
     cy.wait("@getCategory");
-    cy.get("td").last().should("contain", "Test Updated New Category First");
+    cy.get("tr")
+      .last()
+      .should("contain", "Test Updated New Unique Category First");
 
     // Cancel edit
     cy.get('[data-testid="drop-down-mini"]').last().click();
diff --git a/cypress/e2e/fundingOrg.cy.js b/cypress/e2e/boilerplate-e2e/fundingOrg.cy.js
similarity index 100%
rename from cypress/e2e/fundingOrg.cy.js
rename to cypress/e2e/boilerplate-e2e/fundingOrg.cy.js
diff --git a/cypress/e2e/grant.cy.js b/cypress/e2e/boilerplate-e2e/grant.cy.js
similarity index 100%
rename from cypress/e2e/grant.cy.js
rename to cypress/e2e/boilerplate-e2e/grant.cy.js
diff --git a/cypress/e2e/grantShow.cy.js b/cypress/e2e/boilerplate-e2e/grantShow.cy.js
similarity index 100%
rename from cypress/e2e/grantShow.cy.js
rename to cypress/e2e/boilerplate-e2e/grantShow.cy.js
diff --git a/cypress/e2e/grantShowOverview.cy.js b/cypress/e2e/boilerplate-e2e/grantShowOverview.cy.js
similarity index 100%
rename from cypress/e2e/grantShowOverview.cy.js
rename to cypress/e2e/boilerplate-e2e/grantShowOverview.cy.js
diff --git a/cypress/e2e/dnd.cy.js b/cypress/e2e/test-drafts/dnd.cy.js
similarity index 100%
rename from cypress/e2e/dnd.cy.js
rename to cypress/e2e/test-drafts/dnd.cy.js
diff --git a/cypress/e2e/dndV2.cy.js b/cypress/e2e/test-drafts/dndV2.cy.js
similarity index 100%
rename from cypress/e2e/dndV2.cy.js
rename to cypress/e2e/test-drafts/dndV2.cy.js