diff --git a/cypress/e2e/01-admin/02-offence-maint.cy.js b/cypress/e2e/01-admin/02-offence-maint.cy.js
index 56d7a97b..00c82676 100644
--- a/cypress/e2e/01-admin/02-offence-maint.cy.js
+++ b/cypress/e2e/01-admin/02-offence-maint.cy.js
@@ -1,5 +1,5 @@
 import { testAdmin } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 function setBylawFilter() {
     cy.get("button[data-cy='select-bylaw']").click();
     cy.get('.modal').should('be.visible').find('a.panel-block').first().click();
diff --git a/cypress/e2e/01-admin/02-offence-maint.cy.ts b/cypress/e2e/01-admin/02-offence-maint.cy.ts
index af2f5e63..104b6386 100644
--- a/cypress/e2e/01-admin/02-offence-maint.cy.ts
+++ b/cypress/e2e/01-admin/02-offence-maint.cy.ts
@@ -2,7 +2,7 @@
 /* eslint-disable promise/always-return, promise/catch-or-return */
 
 import { testAdmin } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 function setBylawFilter(): void {
   cy.get("button[data-cy='select-bylaw']").click()
diff --git a/cypress/e2e/01-admin/03-cleanup.cy.js b/cypress/e2e/01-admin/03-cleanup.cy.js
index 1800bf80..45c5df11 100644
--- a/cypress/e2e/01-admin/03-cleanup.cy.js
+++ b/cypress/e2e/01-admin/03-cleanup.cy.js
@@ -1,5 +1,5 @@
 import { testAdmin } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 describe('Admin - Database Cleanup', () => {
     beforeEach(() => {
         logout();
diff --git a/cypress/e2e/01-admin/03-cleanup.cy.ts b/cypress/e2e/01-admin/03-cleanup.cy.ts
index 6ba8725c..dc8709c1 100644
--- a/cypress/e2e/01-admin/03-cleanup.cy.ts
+++ b/cypress/e2e/01-admin/03-cleanup.cy.ts
@@ -2,7 +2,7 @@
 /* eslint-disable promise/always-return, promise/catch-or-return */
 
 import { testAdmin } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 describe('Admin - Database Cleanup', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/01-admin/dashboard.cy.js b/cypress/e2e/01-admin/dashboard.cy.js
index 71ee4f43..9d2cac4f 100644
--- a/cypress/e2e/01-admin/dashboard.cy.js
+++ b/cypress/e2e/01-admin/dashboard.cy.js
@@ -1,5 +1,5 @@
 import { testAdmin } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 describe('Dashboard - Admin User', () => {
     beforeEach(() => {
         logout();
diff --git a/cypress/e2e/01-admin/dashboard.cy.ts b/cypress/e2e/01-admin/dashboard.cy.ts
index 86f5dd6f..27a4cf48 100644
--- a/cypress/e2e/01-admin/dashboard.cy.ts
+++ b/cypress/e2e/01-admin/dashboard.cy.ts
@@ -1,5 +1,5 @@
 import { testAdmin } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 describe('Dashboard - Admin User', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/02-update/01-ticket-new.cy.js b/cypress/e2e/02-update/01-ticket-new.cy.js
index 6687662f..083639d3 100644
--- a/cypress/e2e/02-update/01-ticket-new.cy.js
+++ b/cypress/e2e/02-update/01-ticket-new.cy.js
@@ -1,6 +1,6 @@
 import * as configFunctions from '../../../helpers/functions.config.js';
 import { testUpdate } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 describe('Create a New Ticket', () => {
     beforeEach(() => {
         logout();
diff --git a/cypress/e2e/02-update/01-ticket-new.cy.ts b/cypress/e2e/02-update/01-ticket-new.cy.ts
index edc71d24..c2acea6b 100644
--- a/cypress/e2e/02-update/01-ticket-new.cy.ts
+++ b/cypress/e2e/02-update/01-ticket-new.cy.ts
@@ -3,7 +3,7 @@
 
 import * as configFunctions from '../../../helpers/functions.config.js'
 import { testUpdate } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 describe('Create a New Ticket', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/02-update/02-ticket-edit.cy.js b/cypress/e2e/02-update/02-ticket-edit.cy.js
index 151fcae6..eef7408b 100644
--- a/cypress/e2e/02-update/02-ticket-edit.cy.js
+++ b/cypress/e2e/02-update/02-ticket-edit.cy.js
@@ -1,5 +1,5 @@
 import { testUpdate } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 function saveTicket() {
     cy.get("button[type='submit']").contains('Update').click();
     cy.get('.tag').should('contain.text', 'Saved Successfully').should('exist');
diff --git a/cypress/e2e/02-update/02-ticket-edit.cy.ts b/cypress/e2e/02-update/02-ticket-edit.cy.ts
index 21c78dbf..3a0cbcee 100644
--- a/cypress/e2e/02-update/02-ticket-edit.cy.ts
+++ b/cypress/e2e/02-update/02-ticket-edit.cy.ts
@@ -2,7 +2,7 @@
 /* eslint-disable promise/always-return, promise/catch-or-return */
 
 import { testUpdate } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 function saveTicket(): void {
   cy.get("button[type='submit']").contains('Update').click()
diff --git a/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.js b/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.js
index f30aca12..93652893 100644
--- a/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.js
+++ b/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.js
@@ -1,5 +1,5 @@
 import { testUpdate } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 function clearCurrentBatch() {
     cy.get("button[data-cy='clear-batch']")
         .should(Cypress._.noop)
diff --git a/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.ts b/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.ts
index 35a0b10d..80dd809f 100644
--- a/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.ts
+++ b/cypress/e2e/02-update/03-plates-ontario-mtoExport.cy.ts
@@ -2,7 +2,7 @@
 /* eslint-disable promise/always-return, promise/catch-or-return */
 
 import { testUpdate } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 function clearCurrentBatch(): void {
   cy.get("button[data-cy='clear-batch']")
diff --git a/cypress/e2e/02-update/dashboard.cy.js b/cypress/e2e/02-update/dashboard.cy.js
index 21ed27b0..e0e674de 100644
--- a/cypress/e2e/02-update/dashboard.cy.js
+++ b/cypress/e2e/02-update/dashboard.cy.js
@@ -1,5 +1,5 @@
 import { testUpdate } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 describe('Dashboard - Update User', () => {
     beforeEach(() => {
         logout();
diff --git a/cypress/e2e/02-update/dashboard.cy.ts b/cypress/e2e/02-update/dashboard.cy.ts
index 73e960fa..63700589 100644
--- a/cypress/e2e/02-update/dashboard.cy.ts
+++ b/cypress/e2e/02-update/dashboard.cy.ts
@@ -1,5 +1,5 @@
 import { testUpdate } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 describe('Dashboard - Update User', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/02-update/ticket-search.cy.js b/cypress/e2e/02-update/ticket-search.cy.js
index 94d2537d..5f372b98 100644
--- a/cypress/e2e/02-update/ticket-search.cy.js
+++ b/cypress/e2e/02-update/ticket-search.cy.js
@@ -1,5 +1,5 @@
 import { testUpdate } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 describe('Ticket Search - Update User', () => {
     beforeEach(() => {
         logout();
diff --git a/cypress/e2e/02-update/ticket-search.cy.ts b/cypress/e2e/02-update/ticket-search.cy.ts
index a377dcf8..f2a7eb1c 100644
--- a/cypress/e2e/02-update/ticket-search.cy.ts
+++ b/cypress/e2e/02-update/ticket-search.cy.ts
@@ -1,7 +1,7 @@
 /* eslint-disable eslint-comments/disable-enable-pair, unicorn/filename-case */
 
 import { testUpdate } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 describe('Ticket Search - Update User', () => {
   beforeEach(() => {
diff --git a/cypress/e2e/03-readOnly/readOnlyUser.cy.js b/cypress/e2e/03-readOnly/readOnlyUser.cy.js
index df667499..9c1d7579 100644
--- a/cypress/e2e/03-readOnly/readOnlyUser.cy.js
+++ b/cypress/e2e/03-readOnly/readOnlyUser.cy.js
@@ -1,5 +1,5 @@
 import { testView } from '../../../test/_globals.js';
-import { logout, login } from '../../support/index.js';
+import { login, logout } from '../../support/index.js';
 describe('Read Only User', () => {
     beforeEach(() => {
         logout();
diff --git a/cypress/e2e/03-readOnly/readOnlyUser.cy.ts b/cypress/e2e/03-readOnly/readOnlyUser.cy.ts
index fe53fbb1..540eb755 100644
--- a/cypress/e2e/03-readOnly/readOnlyUser.cy.ts
+++ b/cypress/e2e/03-readOnly/readOnlyUser.cy.ts
@@ -1,5 +1,5 @@
 import { testView } from '../../../test/_globals.js'
-import { logout, login } from '../../support/index.js'
+import { login, logout } from '../../support/index.js'
 
 describe('Read Only User', () => {
   beforeEach(() => {