diff --git a/sasjs/sasjsconfig.json b/sasjs/sasjsconfig.json
index a3d2bff..3a870d2 100644
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -7,8 +7,7 @@
     "metax",
     "viya",
     "lua",
-    "tests/base",
-    "tests/fcmp"
+    "tests/crossplatform"
   ],
   "docConfig": {
     "displayMacroCore": false,
@@ -35,7 +34,7 @@
       "allowInsecureRequests": false,
       "appLoc": "/Public/temp/macrocore",
       "macroFolders": [
-        "tests/viya"
+        "tests/viyaonly"
       ],
       "programFolders": [],
       "deployConfig": {
@@ -50,7 +49,7 @@
       "serverType": "SAS9",
       "appLoc": "/Shared Data/temp/macrocore",
       "macroFolders": [
-        "tests/meta"
+        "tests/sas9only"
       ]
     }
   ]
diff --git a/tests/fcmp/mcf_string2file.test.sas b/tests/crossplatform/mcf_string2file.test.sas
similarity index 100%
rename from tests/fcmp/mcf_string2file.test.sas
rename to tests/crossplatform/mcf_string2file.test.sas
diff --git a/tests/base/mf_existfileref.test.sas b/tests/crossplatform/mf_existfileref.test.sas
similarity index 100%
rename from tests/base/mf_existfileref.test.sas
rename to tests/crossplatform/mf_existfileref.test.sas
diff --git a/tests/base/mf_getapploc.test.sas b/tests/crossplatform/mf_getapploc.test.sas
similarity index 100%
rename from tests/base/mf_getapploc.test.sas
rename to tests/crossplatform/mf_getapploc.test.sas
diff --git a/tests/base/mf_getvarlist.test.sas b/tests/crossplatform/mf_getvarlist.test.sas
similarity index 100%
rename from tests/base/mf_getvarlist.test.sas
rename to tests/crossplatform/mf_getvarlist.test.sas
diff --git a/tests/base/mp_abort.test.nofix.sas b/tests/crossplatform/mp_abort.test.nofix.sas
similarity index 100%
rename from tests/base/mp_abort.test.nofix.sas
rename to tests/crossplatform/mp_abort.test.nofix.sas
diff --git a/tests/base/mp_assertcolvals.test.sas b/tests/crossplatform/mp_assertcolvals.test.sas
similarity index 100%
rename from tests/base/mp_assertcolvals.test.sas
rename to tests/crossplatform/mp_assertcolvals.test.sas
diff --git a/tests/base/mp_assertdsobs.test.sas b/tests/crossplatform/mp_assertdsobs.test.sas
similarity index 100%
rename from tests/base/mp_assertdsobs.test.sas
rename to tests/crossplatform/mp_assertdsobs.test.sas
diff --git a/tests/base/mp_base64copy.test.sas b/tests/crossplatform/mp_base64copy.test.sas
similarity index 100%
rename from tests/base/mp_base64copy.test.sas
rename to tests/crossplatform/mp_base64copy.test.sas
diff --git a/tests/base/mp_ds2fmtds.test.sas b/tests/crossplatform/mp_ds2fmtds.test.sas
similarity index 100%
rename from tests/base/mp_ds2fmtds.test.sas
rename to tests/crossplatform/mp_ds2fmtds.test.sas
diff --git a/tests/base/mp_ds2inserts.test.sas b/tests/crossplatform/mp_ds2inserts.test.sas
similarity index 100%
rename from tests/base/mp_ds2inserts.test.sas
rename to tests/crossplatform/mp_ds2inserts.test.sas
diff --git a/tests/base/mp_filtercheck.test.sas b/tests/crossplatform/mp_filtercheck.test.sas
similarity index 100%
rename from tests/base/mp_filtercheck.test.sas
rename to tests/crossplatform/mp_filtercheck.test.sas
diff --git a/tests/base/mp_filtergenerate.test.sas b/tests/crossplatform/mp_filtergenerate.test.sas
similarity index 100%
rename from tests/base/mp_filtergenerate.test.sas
rename to tests/crossplatform/mp_filtergenerate.test.sas
diff --git a/tests/base/mp_filtervalidate.test.sas b/tests/crossplatform/mp_filtervalidate.test.sas
similarity index 100%
rename from tests/base/mp_filtervalidate.test.sas
rename to tests/crossplatform/mp_filtervalidate.test.sas
diff --git a/tests/base/mp_getddl.test.sas b/tests/crossplatform/mp_getddl.test.sas
similarity index 100%
rename from tests/base/mp_getddl.test.sas
rename to tests/crossplatform/mp_getddl.test.sas
diff --git a/tests/base/mp_jsonout.test.sas b/tests/crossplatform/mp_jsonout.test.sas
similarity index 100%
rename from tests/base/mp_jsonout.test.sas
rename to tests/crossplatform/mp_jsonout.test.sas
diff --git a/tests/base/mp_lib2inserts.test.sas b/tests/crossplatform/mp_lib2inserts.test.sas
similarity index 100%
rename from tests/base/mp_lib2inserts.test.sas
rename to tests/crossplatform/mp_lib2inserts.test.sas
diff --git a/tests/base/mp_searchcols.test.sas b/tests/crossplatform/mp_searchcols.test.sas
similarity index 100%
rename from tests/base/mp_searchcols.test.sas
rename to tests/crossplatform/mp_searchcols.test.sas
diff --git a/tests/base/mp_validatecol.test.sas b/tests/crossplatform/mp_validatecol.test.sas
similarity index 100%
rename from tests/base/mp_validatecol.test.sas
rename to tests/crossplatform/mp_validatecol.test.sas
diff --git a/tests/meta/mm_webout.test.sas b/tests/sas9only/mm_webout.test.sas
similarity index 100%
rename from tests/meta/mm_webout.test.sas
rename to tests/sas9only/mm_webout.test.sas
diff --git a/tests/viya/mfv_existfile.test.sas b/tests/viyaonly/mfv_existfile.test.sas
similarity index 100%
rename from tests/viya/mfv_existfile.test.sas
rename to tests/viyaonly/mfv_existfile.test.sas
diff --git a/tests/viya/mfv_existfolder.test.sas b/tests/viyaonly/mfv_existfolder.test.sas
similarity index 100%
rename from tests/viya/mfv_existfolder.test.sas
rename to tests/viyaonly/mfv_existfolder.test.sas
diff --git a/tests/viya/mv_createfile.test.sas b/tests/viyaonly/mv_createfile.test.sas
similarity index 100%
rename from tests/viya/mv_createfile.test.sas
rename to tests/viyaonly/mv_createfile.test.sas
diff --git a/tests/viya/mv_createfolder.test.sas b/tests/viyaonly/mv_createfolder.test.sas
similarity index 100%
rename from tests/viya/mv_createfolder.test.sas
rename to tests/viyaonly/mv_createfolder.test.sas
diff --git a/tests/viya/mv_createwebservice.test.sas b/tests/viyaonly/mv_createwebservice.test.sas
similarity index 100%
rename from tests/viya/mv_createwebservice.test.sas
rename to tests/viyaonly/mv_createwebservice.test.sas
diff --git a/tests/viya/mv_getjobcode.test.sas b/tests/viyaonly/mv_getjobcode.test.sas
similarity index 100%
rename from tests/viya/mv_getjobcode.test.sas
rename to tests/viyaonly/mv_getjobcode.test.sas
diff --git a/tests/viya/mv_getjoblog.test.sas b/tests/viyaonly/mv_getjoblog.test.sas
similarity index 100%
rename from tests/viya/mv_getjoblog.test.sas
rename to tests/viyaonly/mv_getjoblog.test.sas
diff --git a/tests/viya/mv_getjobresult.test.sas b/tests/viyaonly/mv_getjobresult.test.sas
similarity index 100%
rename from tests/viya/mv_getjobresult.test.sas
rename to tests/viyaonly/mv_getjobresult.test.sas
diff --git a/tests/viya/mv_jobflow.test.1.sas b/tests/viyaonly/mv_jobflow.test.1.sas
similarity index 100%
rename from tests/viya/mv_jobflow.test.1.sas
rename to tests/viyaonly/mv_jobflow.test.1.sas
diff --git a/tests/viya/mv_jobflow.test.2.sas b/tests/viyaonly/mv_jobflow.test.2.sas
similarity index 100%
rename from tests/viya/mv_jobflow.test.2.sas
rename to tests/viyaonly/mv_jobflow.test.2.sas
diff --git a/tests/viya/mv_registerclient.test.1.sas b/tests/viyaonly/mv_registerclient.test.1.sas
similarity index 100%
rename from tests/viya/mv_registerclient.test.1.sas
rename to tests/viyaonly/mv_registerclient.test.1.sas
diff --git a/tests/viya/mv_registerclient.test.2.sas b/tests/viyaonly/mv_registerclient.test.2.sas
similarity index 100%
rename from tests/viya/mv_registerclient.test.2.sas
rename to tests/viyaonly/mv_registerclient.test.2.sas
diff --git a/tests/viya/mv_webout.test.sas b/tests/viyaonly/mv_webout.test.sas
similarity index 100%
rename from tests/viya/mv_webout.test.sas
rename to tests/viyaonly/mv_webout.test.sas