diff --git a/ProcessLib/ThermoHydroMechanics/Tests.cmake b/ProcessLib/ThermoHydroMechanics/Tests.cmake
index 4407c39c966b2d4cd1d40cbc81e9847e310e6247..322e44c1591a7b1afce8c62a28ccfd3d1b31aa97 100644
--- a/ProcessLib/ThermoHydroMechanics/Tests.cmake
+++ b/ProcessLib/ThermoHydroMechanics/Tests.cmake
@@ -8,8 +8,8 @@ if (NOT OGS_USE_MPI)
     OgsTest(PROJECTFILE ThermoHydroMechanics/HeatingHomogeneousDomain/hex_THM.prj RUNTIME 30)
     OgsTest(PROJECTFILE ThermoHydroMechanics/9percentWaterFreezingExpansion/UnitSquare.prj RUNTIME 1)
     OgsTest(PROJECTFILE ThermoHydroMechanics/Linear/HeatTransportInStationaryFlow/WithFreezingPhase.prj RUNTIME 1)
-    OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs.prj RUNTIME 1)
-    OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart.xml RUNTIME 1)
+    OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.prj RUNTIME 1)
+    OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.xml RUNTIME 1)
 endif()
 
 AddTest(
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs.prj b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.prj
similarity index 99%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs.prj
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.prj
index 414d87b2265017c3f842cdf7b94275d10f707172..4269877af2a8030ddba6412daba4b6521fb768d6 100644
--- a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs.prj
+++ b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.prj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
     Same as for SmallDeformation process, checking solid multi-material internal
-    state variables output.
+    state variables output  for a (TH)M process.
     -->
 <OpenGeoSysProject>
     <mesh>square_1x1_quad_1e1_2_matIDs.vtu</mesh>
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs.pvd b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.pvd
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs.pvd
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.pvd
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart.pvd b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.pvd
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart.pvd
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.pvd
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart.xml b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.xml
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart.xml
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.xml
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_0.7000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.7000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_0.7000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.7000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_0.8000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.8000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_0.8000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.8000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_0.9000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.9000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_0.9000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.9000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_1.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_1.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_restart_t_1.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_1.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.1000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.1000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.1000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.1000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.2000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.2000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.2000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.2000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.3000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.3000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.3000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.3000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.4000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.4000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.4000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.4000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.5000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.5000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.5700.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5700.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.5700.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5700.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.6000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.6000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.6000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.6000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.7000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.7000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.7000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.7000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.8000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.8000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.8000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.8000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.9000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.9000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_0.9000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.9000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_1.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_1.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1e1_2_matIDs_t_1.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_1.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1.gml b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1.gml
new file mode 120000
index 0000000000000000000000000000000000000000..bed822be912241db003a4808d827686119a38baa
--- /dev/null
+++ b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1.gml
@@ -0,0 +1 @@
+../square_1x1.gml
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1_quad_1e1_2_matIDs.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1_quad_1e1_2_matIDs.vtu
new file mode 120000
index 0000000000000000000000000000000000000000..d8472c4198e3528d8814e3849eff334d2aaff64b
--- /dev/null
+++ b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1_quad_1e1_2_matIDs.vtu
@@ -0,0 +1 @@
+../square_1x1_quad_1e1_2_matIDs.vtu
\ No newline at end of file