diff --git a/test/io/vtk/CMakeLists.txt b/test/io/vtk/CMakeLists.txt
index af972e7059aedfa852dc7fcbb75adb5f6f6f82b0..2977a9c75e3dcea835943a01da29c9fedd641cf3 100644
--- a/test/io/vtk/CMakeLists.txt
+++ b/test/io/vtk/CMakeLists.txt
@@ -9,8 +9,8 @@ dumux_add_test(NAME test_vtkreader_3d
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_vtkreader_3d
-                                  ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu test-3d"
-                       --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu
+                                  ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p2c_richards2c_3d-reference.vtu test-3d"
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
                                ${CMAKE_CURRENT_BINARY_DIR}/test-3d.vtu)
 
 # dumux_add_test(NAME test_vtkreader_3d_structured_notimplemented
@@ -38,8 +38,8 @@ dumux_add_test(NAME test_vtkreader_2d3d
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_vtkreader_2d3d
-                                  ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu test-2d3d"
-                       --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
+                                  ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_2d3d_fracture1p_tpfa_2d-reference.vtu test-2d3d"
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_2d3d_fracture1p_tpfa_2d-reference.vtu
                    ${CMAKE_CURRENT_BINARY_DIR}/test-2d3d.vtu)
 
 dumux_add_test(NAME test_vtkreader_1d
@@ -50,8 +50,8 @@ dumux_add_test(NAME test_vtkreader_1d
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_vtkreader_1d
-                                  ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp test-1d"
-                       --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
+                                  ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_1d-reference.vtp test-1d"
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_1d-reference.vtp
                                ${CMAKE_CURRENT_BINARY_DIR}/test-1d.vtp)
 
 dumux_add_test(NAME test_vtkreader_1d_polyline
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
index 78df38b3e72e6693857f1b58128af76b0062665f..7e811c87990400765e4413160f0d6379e0e1245f 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
@@ -1,14 +1,14 @@
-dumux_add_test(NAME test_md_embedded1d3d_1p2c_richards2c
+dumux_add_test(NAME test_md_embedded_1d3d_1p2c_richards2c
               LABELS multidomain multidomain_embedded 1pnc richardsnc
               SOURCES main.cc
               CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )"
               TIMEOUT 1500
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p2c_richards2c_1d-00003.vtp
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p2c_richards2c_3d-00003.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p2c_richards2c params.input
-                        -Vtk.OutputName test_md_embedded1d3d_1p2c_richards2c")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p2c_richards2c_1d-00003.vtp
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p2c_richards2c_3d-00003.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p2c_richards2c params.input
+                        -Vtk.OutputName test_md_embedded_1d3d_1p2c_richards2c")
 dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
index 2b14bf68efcb82cc07ce8e9829adf6bf99fa5de9..c4b6acb44f14c38ab1341422b23f542db973f886 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
@@ -1,81 +1,81 @@
-dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_average
+dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_average
               LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-00001.vtp
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfatpfa_average params.input \
-                                   -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfatpfa_average")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_tpfatpfa_average_1d-00001.vtp
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_tpfatpfa_average_3d-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_tpfatpfa_average params.input \
+                                   -Vtk.OutputName test_md_embedded_1d3d_1p1p_tpfatpfa_average")
 
-dumux_add_test(NAME test_md_embedded1d3d_1p1p_boxtpfa_average
+dumux_add_test(NAME test_md_embedded_1d3d_1p1p_boxtpfa_average
               LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxtpfa_average_1d-00001.vtp
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxtpfa_average_3d-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxtpfa_average params.input \
-                                   -Vtk.OutputName test_md_embedded1d3d_1p1p_boxtpfa_average -Tissue.Grid.Cells \"19 19 19\"")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_boxtpfa_average_1d-00001.vtp
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_boxbox_average_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_boxtpfa_average_3d-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_boxtpfa_average params.input \
+                                   -Vtk.OutputName test_md_embedded_1d3d_1p1p_boxtpfa_average -Tissue.Grid.Cells \"19 19 19\"")
 
-dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfabox_average
+dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfabox_average
               LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfabox_average_1d-00001.vtp
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfabox_average_3d-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfabox_average params.input \
-                                   -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfabox_average")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_boxbox_average_1d-reference.vtp
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_tpfabox_average_1d-00001.vtp
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_tpfabox_average_3d-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_tpfabox_average params.input \
+                                   -Vtk.OutputName test_md_embedded_1d3d_1p1p_tpfabox_average")
 
-dumux_add_test(NAME test_md_embedded1d3d_1p1p_boxbox_average
+dumux_add_test(NAME test_md_embedded_1d3d_1p1p_boxbox_average
               LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxbox_average_1d-00001.vtp
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxbox_average_3d-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxbox_average params.input \
-                                   -Vtk.OutputName test_md_embedded1d3d_1p1p_boxbox_average -Tissue.Grid.Cells \"19 19 19\"")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_boxbox_average_1d-reference.vtp
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_boxbox_average_1d-00001.vtp
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p1p_boxbox_average_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_boxbox_average_3d-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p1p_boxbox_average params.input \
+                                   -Vtk.OutputName test_md_embedded_1d3d_1p1p_boxbox_average -Tissue.Grid.Cells \"19 19 19\"")
 
 # make sure these configurations compile and run too
-dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources
+dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_cylindersources
               LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::cylindersources
-              COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources
+              COMMAND ./test_md_embedded_1d3d_1p1p_tpfatpfa_cylindersources
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS params.input)
 
-dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_line
+dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_line
               LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::line
-              COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_line
+              COMMAND ./test_md_embedded_1d3d_1p1p_tpfatpfa_line
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS params.input)
 
-dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_kernel
+dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_kernel
               LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::kernel
-              COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_kernel
+              COMMAND ./test_md_embedded_1d3d_1p1p_tpfatpfa_kernel
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS params.input)
 
diff --git a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
index 6dbe99bb6f0c8e4af94e5bc8c232d06a8d9d0a1c..690280bb6651b77c5047f8eac78781ad31bbda0a 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
@@ -1,4 +1,4 @@
-dumux_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa
+dumux_add_test(NAME test_md_embedded_1d3d_1p_richards_tpfatpfa
               LABELS multidomain multidomain_embedded 1p richards
               SOURCES main.cc
               COMPILE_DEFINITIONS SOILTYPETAG=SoilCC
@@ -6,14 +6,14 @@ dumux_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa
               CMAKE_GUARD dune-foamgrid_FOUND
               TIMEOUT 1500
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-00004.vtp
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-00004.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa params.input \
-                                   -Vtk.OutputName test_md_embedded1d3d_1p_richards_tpfatpfa")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_1d-reference.vtp
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p_richards_tpfatpfa_1d-00004.vtp
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p_richards_tpfatpfa_3d-00004.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p_richards_tpfatpfa params.input \
+                                   -Vtk.OutputName test_md_embedded_1d3d_1p_richards_tpfatpfa")
 
-dumux_add_test(NAME test_md_embedded1d3d_1p_richards_tpfabox
+dumux_add_test(NAME test_md_embedded_1d3d_1p_richards_tpfabox
               LABELS multidomain multidomain_embedded 1p richards
               SOURCES main.cc
               COMPILE_DEFINITIONS SOILTYPETAG=SoilBox
@@ -21,10 +21,10 @@ dumux_add_test(NAME test_md_embedded1d3d_1p_richards_tpfabox
               CMAKE_GUARD dune-foamgrid_FOUND
               TIMEOUT 1500
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfabox_1d-00004.vtp
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfabox_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfabox_3d-00004.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfabox params.input \
-                                   -Vtk.OutputName test_md_embedded1d3d_1p_richards_tpfabox")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_1d-reference.vtp
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p_richards_tpfabox_1d-00004.vtp
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_1d3d_1p_richards_tpfabox_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p_richards_tpfabox_3d-00004.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_1d3d_1p_richards_tpfabox params.input \
+                                   -Vtk.OutputName test_md_embedded_1d3d_1p_richards_tpfabox")
 dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
index 59b2aa285e721a92249074f18fd61107047e04ce..bfceae77fc4a47173d3c00349e664010cc8117be 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
+++ b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
@@ -1,28 +1,28 @@
-add_executable(test_md_embedded2d3d_fracture1p_tpfa EXCLUDE_FROM_ALL main.cc)
+add_executable(test_md_embedded_2d3d_fracture1p_tpfa EXCLUDE_FROM_ALL main.cc)
 
-dumux_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_linearsolver
+dumux_add_test(NAME test_md_embedded_2d3d_fracture1p_tpfa_linearsolver
               LABELS multidomain multidomain_embedded 1p
-              TARGET test_md_embedded2d3d_fracture1p_tpfa
+              TARGET test_md_embedded_2d3d_fracture1p_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_linearsolver_2d-00001.vtu
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_linearsolver_3d-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa params.input \
-                                   -Vtk.OutputName test_md_embedded2d3d_fracture1p_tpfa_linearsolver -Problem.SolverType linear")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_2d3d_fracture1p_tpfa_2d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_2d3d_fracture1p_tpfa_linearsolver_2d-00001.vtu
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_2d3d_fracture1p_tpfa_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_2d3d_fracture1p_tpfa_linearsolver_3d-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_2d3d_fracture1p_tpfa params.input \
+                                   -Vtk.OutputName test_md_embedded_2d3d_fracture1p_tpfa_linearsolver -Problem.SolverType linear")
 
-dumux_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver
+dumux_add_test(NAME test_md_embedded_2d3d_fracture1p_tpfa_nonlinearsolver
               LABELS multidomain multidomain_embedded 1p
-              TARGET test_md_embedded2d3d_fracture1p_tpfa
+              TARGET test_md_embedded_2d3d_fracture1p_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver_2d-00001.vtu
-                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver_3d-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa params.input \
-                                   -Vtk.OutputName test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver -Problem.SolverType nonlinear")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_2d3d_fracture1p_tpfa_2d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_2d3d_fracture1p_tpfa_nonlinearsolver_2d-00001.vtu
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded_2d3d_fracture1p_tpfa_3d-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_2d3d_fracture1p_tpfa_nonlinearsolver_3d-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded_2d3d_fracture1p_tpfa params.input \
+                                   -Vtk.OutputName test_md_embedded_2d3d_fracture1p_tpfa_nonlinearsolver -Problem.SolverType nonlinear")
 dune_symlink_to_source_files(FILES "fracture.msh" "params.input")
diff --git a/test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp b/test/references/test_md_embedded_1d3d_1p1p_boxbox_average_1d-reference.vtp
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp
rename to test/references/test_md_embedded_1d3d_1p1p_boxbox_average_1d-reference.vtp
diff --git a/test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu b/test/references/test_md_embedded_1d3d_1p1p_boxbox_average_3d-reference.vtu
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu
rename to test/references/test_md_embedded_1d3d_1p1p_boxbox_average_3d-reference.vtu
diff --git a/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp b/test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
rename to test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
diff --git a/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu b/test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
rename to test/references/test_md_embedded_1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
diff --git a/test/references/test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp b/test/references/test_md_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp
rename to test/references/test_md_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
diff --git a/test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu b/test/references/test_md_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu
rename to test/references/test_md_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
diff --git a/test/references/test_md_embedded1d3d_1p_richards_tpfabox_3d-reference.vtu b/test/references/test_md_embedded_1d3d_1p_richards_tpfabox_3d-reference.vtu
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p_richards_tpfabox_3d-reference.vtu
rename to test/references/test_md_embedded_1d3d_1p_richards_tpfabox_3d-reference.vtu
diff --git a/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp b/test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_1d-reference.vtp
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
rename to test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_1d-reference.vtp
diff --git a/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-reference.vtu b/test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_3d-reference.vtu
similarity index 100%
rename from test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-reference.vtu
rename to test/references/test_md_embedded_1d3d_1p_richards_tpfatpfa_3d-reference.vtu
diff --git a/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu b/test/references/test_md_embedded_2d3d_fracture1p_tpfa_2d-reference.vtu
similarity index 100%
rename from test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
rename to test/references/test_md_embedded_2d3d_fracture1p_tpfa_2d-reference.vtu
diff --git a/test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu b/test/references/test_md_embedded_2d3d_fracture1p_tpfa_3d-reference.vtu
similarity index 100%
rename from test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu
rename to test/references/test_md_embedded_2d3d_fracture1p_tpfa_3d-reference.vtu