diff --git a/main.dox b/main.dox
index 1d4a2cb..c7cd9d9 100644
--- a/main.dox
+++ b/main.dox
@@ -18,7 +18,17 @@
     statements.  Those starting `mp_` are macro _procedures_, which generate
     SAS statements, and must therefore be applied accordingly.
 
- */
+*/
+
+/*! \dir ddl
+ *  \brief Data Definition Language files
+ *  \details Provides templates for commonly used tables in sasjs/core.
+    Attributes:
+
+        * OS independent
+        * No X command
+        * Prefixes: _mddl_
+*/
 
 /*! \dir fcmp
  *  \brief Macros for generating FCMP functions
@@ -94,15 +104,28 @@
 
 */
 
-/*! \dir ddl
- *  \brief Data Definition Language files
- *  \details Provides templates for commonly used tables in sasjs/core.
-   Attributes:
+/*! \dir tests/base
+ *  \brief Tests for Base macros
+ */
 
-        * OS independent
-        * No X command
-        * Prefixes: _mddl_
+/*! \dir tests/ddlonly
+ *  \brief Tests for DDL macros
+ */
 
+/*! \dir tests/sas9only
+ *  \brief Tests for SAS Metadata macros
+ */
+
+/*! \dir tests/serveronly
+ *  \brief Tests for SASjs Server macros
+ */
+
+/*! \dir tests/viyaonly
+ *  \brief Tests for Viya macros
+ */
+
+/*! \dir tests/x-platform
+ *  \brief Tests for cross-platform macros
  */
 
 /*! \dir xplatform
diff --git a/sasjs/sasjsconfig.json b/sasjs/sasjsconfig.json
index 6bde89a..34da685 100644
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -8,8 +8,8 @@
     "server",
     "xplatform",
     "tests/base",
-    "tests/ddl",
-    "tests/xplatform"
+    "tests/ddlonly",
+    "tests/x-platform"
   ],
   "docConfig": {
     "displayMacroCore": false,
diff --git a/tests/ddl/mddl_dc_difftable.test.sas b/tests/ddlonly/mddl_dc_difftable.test.sas
similarity index 100%
rename from tests/ddl/mddl_dc_difftable.test.sas
rename to tests/ddlonly/mddl_dc_difftable.test.sas
diff --git a/tests/ddl/mddl_dc_filterdetail.test.sas b/tests/ddlonly/mddl_dc_filterdetail.test.sas
similarity index 100%
rename from tests/ddl/mddl_dc_filterdetail.test.sas
rename to tests/ddlonly/mddl_dc_filterdetail.test.sas
diff --git a/tests/ddl/mddl_dc_filtersummary.test.sas b/tests/ddlonly/mddl_dc_filtersummary.test.sas
similarity index 100%
rename from tests/ddl/mddl_dc_filtersummary.test.sas
rename to tests/ddlonly/mddl_dc_filtersummary.test.sas
diff --git a/tests/ddl/mddl_dc_locktable.test.sas b/tests/ddlonly/mddl_dc_locktable.test.sas
similarity index 100%
rename from tests/ddl/mddl_dc_locktable.test.sas
rename to tests/ddlonly/mddl_dc_locktable.test.sas
diff --git a/tests/ddl/mddl_dc_maxkeytable.test.sas b/tests/ddlonly/mddl_dc_maxkeytable.test.sas
similarity index 100%
rename from tests/ddl/mddl_dc_maxkeytable.test.sas
rename to tests/ddlonly/mddl_dc_maxkeytable.test.sas
diff --git a/tests/ddl/mddl_sas_cntlout.test.sas b/tests/ddlonly/mddl_sas_cntlout.test.sas
similarity index 100%
rename from tests/ddl/mddl_sas_cntlout.test.sas
rename to tests/ddlonly/mddl_sas_cntlout.test.sas
diff --git a/tests/xplatform/mx_getcode.test.sas b/tests/x-platform/mx_getcode.test.sas
similarity index 100%
rename from tests/xplatform/mx_getcode.test.sas
rename to tests/x-platform/mx_getcode.test.sas
diff --git a/tests/xplatform/mx_testservice.test.sas b/tests/x-platform/mx_testservice.test.sas
similarity index 100%
rename from tests/xplatform/mx_testservice.test.sas
rename to tests/x-platform/mx_testservice.test.sas