diff --git a/e2e/cypress.json b/e2e/cypress.json
index fe2157f..42aee68 100644
--- a/e2e/cypress.json
+++ b/e2e/cypress.json
@@ -3,12 +3,12 @@
     "integrationFolder": "tests",
     "supportFile":"support",
     "xxbaseUrl": "http://localhost:7575",
-    "xbaseUrl": "https://test.helloayanova.com",
-    "baseUrl":"http://localhost:8080",   
+    "baseUrl": "https://test.helloayanova.com",
+    "xbaseUrl":"http://localhost:8080",   
     "video":false,
     "env": {
-        "apiBaseUrl":"http://localhost:7575/api/v8.0/",
-        "xapiBaseUrl":"https://test.helloayanova.com/api/v8.0/",
+        "xapiBaseUrl":"http://localhost:7575/api/v8.0/",
+        "apiBaseUrl":"https://test.helloayanova.com/api/v8.0/",
         "adminusername": "superuser",
         "adminpassword": "l3tm3in",
         "accountinguser": "Accounting",
diff --git a/e2e/tests/regression/1-smoke/1-home.js b/e2e/tests/regression/1-smoke/001-home.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/1-home.js
rename to e2e/tests/regression/1-smoke/001-home.js
diff --git a/e2e/tests/regression/1-smoke/2-customer.js b/e2e/tests/regression/1-smoke/002-customer.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/2-customer.js
rename to e2e/tests/regression/1-smoke/002-customer.js
diff --git a/e2e/tests/regression/1-smoke/3.0-service-misc.js b/e2e/tests/regression/1-smoke/003-service-misc.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/3.0-service-misc.js
rename to e2e/tests/regression/1-smoke/003-service-misc.js
diff --git a/e2e/tests/regression/1-smoke/3.1-service-wo.js b/e2e/tests/regression/1-smoke/004-service-wo.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/3.1-service-wo.js
rename to e2e/tests/regression/1-smoke/004-service-wo.js
diff --git a/e2e/tests/regression/1-smoke/3.2-service-quote.js b/e2e/tests/regression/1-smoke/005-service-quote.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/3.2-service-quote.js
rename to e2e/tests/regression/1-smoke/005-service-quote.js
diff --git a/e2e/tests/regression/1-smoke/3.3-service-pm.js b/e2e/tests/regression/1-smoke/006-service-pm.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/3.3-service-pm.js
rename to e2e/tests/regression/1-smoke/006-service-pm.js
diff --git a/e2e/tests/regression/1-smoke/4-inventory.js b/e2e/tests/regression/1-smoke/007-inventory.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/4-inventory.js
rename to e2e/tests/regression/1-smoke/007-inventory.js
diff --git a/e2e/tests/regression/1-smoke/5-vendors.js b/e2e/tests/regression/1-smoke/008-vendors.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/5-vendors.js
rename to e2e/tests/regression/1-smoke/008-vendors.js
diff --git a/e2e/tests/regression/1-smoke/6-accounting.js b/e2e/tests/regression/1-smoke/009-accounting.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/6-accounting.js
rename to e2e/tests/regression/1-smoke/009-accounting.js
diff --git a/e2e/tests/regression/1-smoke/7-administration.js b/e2e/tests/regression/1-smoke/010-administration.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/7-administration.js
rename to e2e/tests/regression/1-smoke/010-administration.js
diff --git a/e2e/tests/regression/1-smoke/8-server-operations.js b/e2e/tests/regression/1-smoke/011-server-operations.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/8-server-operations.js
rename to e2e/tests/regression/1-smoke/011-server-operations.js
diff --git a/e2e/tests/regression/1-smoke/9-misc.js b/e2e/tests/regression/1-smoke/012-misc.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/9-misc.js
rename to e2e/tests/regression/1-smoke/012-misc.js
diff --git a/e2e/tests/regression/1-smoke/10-customer-user.js b/e2e/tests/regression/1-smoke/013-customer-user.js
similarity index 100%
rename from e2e/tests/regression/1-smoke/10-customer-user.js
rename to e2e/tests/regression/1-smoke/013-customer-user.js