diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ce4665ce81a42eef2e114a7448101dcf554c8c32..ff547283b232ac8bc0087827cd1b24d50cf1c208 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,7 @@
 add_subdirectory("common")
-add_subdirectory("decoupled")
 add_subdirectory("freeflow")
 add_subdirectory("geomechanics")
-add_subdirectory("implicit")
 add_subdirectory("io")
 add_subdirectory("material")
 add_subdirectory("multidomain")
+add_subdirectory("porousmediumflow")
diff --git a/test/decoupled/CMakeLists.txt b/test/decoupled/CMakeLists.txt
deleted file mode 100644
index 9513118d26b8cced1fe0eb829d5a1bf06eafe2e7..0000000000000000000000000000000000000000
--- a/test/decoupled/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory("1p")
-add_subdirectory("2p")
-add_subdirectory("2p2c")
diff --git a/test/porousmediumflow/1p/CMakeLists.txt b/test/porousmediumflow/1p/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fffa571735a25e9bb52347bd7e142ac034ac7c5d
--- /dev/null
+++ b/test/porousmediumflow/1p/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory("implicit")
+add_subdirectory("sequential")
diff --git a/test/implicit/1p/1pniconductionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
similarity index 100%
rename from test/implicit/1p/1pniconductionproblem.hh
rename to test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
diff --git a/test/implicit/1p/1pniconvectionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
similarity index 100%
rename from test/implicit/1p/1pniconvectionproblem.hh
rename to test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
diff --git a/test/implicit/1p/1pnispatialparams.hh b/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
similarity index 100%
rename from test/implicit/1p/1pnispatialparams.hh
rename to test/porousmediumflow/1p/implicit/1pnispatialparams.hh
diff --git a/test/implicit/1p/1ptestproblem.hh b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
similarity index 100%
rename from test/implicit/1p/1ptestproblem.hh
rename to test/porousmediumflow/1p/implicit/1ptestproblem.hh
diff --git a/test/implicit/1p/1ptestspatialparams.hh b/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
similarity index 100%
rename from test/implicit/1p/1ptestspatialparams.hh
rename to test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
diff --git a/test/implicit/1p/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/1p/CMakeLists.txt
rename to test/porousmediumflow/1p/implicit/CMakeLists.txt
diff --git a/test/implicit/1p/grids/test_1p_1d.dgf b/test/porousmediumflow/1p/implicit/grids/test_1p_1d.dgf
similarity index 100%
rename from test/implicit/1p/grids/test_1p_1d.dgf
rename to test/porousmediumflow/1p/implicit/grids/test_1p_1d.dgf
diff --git a/test/implicit/1p/grids/test_1p_1d3d.dgf b/test/porousmediumflow/1p/implicit/grids/test_1p_1d3d.dgf
similarity index 100%
rename from test/implicit/1p/grids/test_1p_1d3d.dgf
rename to test/porousmediumflow/1p/implicit/grids/test_1p_1d3d.dgf
diff --git a/test/implicit/1p/grids/test_1p_2d.dgf b/test/porousmediumflow/1p/implicit/grids/test_1p_2d.dgf
similarity index 100%
rename from test/implicit/1p/grids/test_1p_2d.dgf
rename to test/porousmediumflow/1p/implicit/grids/test_1p_2d.dgf
diff --git a/test/implicit/1p/grids/test_1p_2d3d.dgf b/test/porousmediumflow/1p/implicit/grids/test_1p_2d3d.dgf
similarity index 100%
rename from test/implicit/1p/grids/test_1p_2d3d.dgf
rename to test/porousmediumflow/1p/implicit/grids/test_1p_2d3d.dgf
diff --git a/test/implicit/1p/grids/test_1p_3d.dgf b/test/porousmediumflow/1p/implicit/grids/test_1p_3d.dgf
similarity index 100%
rename from test/implicit/1p/grids/test_1p_3d.dgf
rename to test/porousmediumflow/1p/implicit/grids/test_1p_3d.dgf
diff --git a/test/implicit/1p/grids/test_1pniconduction.dgf b/test/porousmediumflow/1p/implicit/grids/test_1pniconduction.dgf
similarity index 100%
rename from test/implicit/1p/grids/test_1pniconduction.dgf
rename to test/porousmediumflow/1p/implicit/grids/test_1pniconduction.dgf
diff --git a/test/implicit/1p/grids/test_1pniconvection.dgf b/test/porousmediumflow/1p/implicit/grids/test_1pniconvection.dgf
similarity index 100%
rename from test/implicit/1p/grids/test_1pniconvection.dgf
rename to test/porousmediumflow/1p/implicit/grids/test_1pniconvection.dgf
diff --git a/test/implicit/1p/test_box1p.cc b/test/porousmediumflow/1p/implicit/test_box1p.cc
similarity index 100%
rename from test/implicit/1p/test_box1p.cc
rename to test/porousmediumflow/1p/implicit/test_box1p.cc
diff --git a/test/implicit/1p/test_box1p.input b/test/porousmediumflow/1p/implicit/test_box1p.input
similarity index 100%
rename from test/implicit/1p/test_box1p.input
rename to test/porousmediumflow/1p/implicit/test_box1p.input
diff --git a/test/implicit/1p/test_box1p1d3d.cc b/test/porousmediumflow/1p/implicit/test_box1p1d3d.cc
similarity index 100%
rename from test/implicit/1p/test_box1p1d3d.cc
rename to test/porousmediumflow/1p/implicit/test_box1p1d3d.cc
diff --git a/test/implicit/1p/test_box1p1d3d.input b/test/porousmediumflow/1p/implicit/test_box1p1d3d.input
similarity index 100%
rename from test/implicit/1p/test_box1p1d3d.input
rename to test/porousmediumflow/1p/implicit/test_box1p1d3d.input
diff --git a/test/implicit/1p/test_box1p2d3d.cc b/test/porousmediumflow/1p/implicit/test_box1p2d3d.cc
similarity index 100%
rename from test/implicit/1p/test_box1p2d3d.cc
rename to test/porousmediumflow/1p/implicit/test_box1p2d3d.cc
diff --git a/test/implicit/1p/test_box1p2d3d.input b/test/porousmediumflow/1p/implicit/test_box1p2d3d.input
similarity index 100%
rename from test/implicit/1p/test_box1p2d3d.input
rename to test/porousmediumflow/1p/implicit/test_box1p2d3d.input
diff --git a/test/implicit/1p/test_box1pniconduction.cc b/test/porousmediumflow/1p/implicit/test_box1pniconduction.cc
similarity index 100%
rename from test/implicit/1p/test_box1pniconduction.cc
rename to test/porousmediumflow/1p/implicit/test_box1pniconduction.cc
diff --git a/test/implicit/1p/test_box1pniconduction.input b/test/porousmediumflow/1p/implicit/test_box1pniconduction.input
similarity index 100%
rename from test/implicit/1p/test_box1pniconduction.input
rename to test/porousmediumflow/1p/implicit/test_box1pniconduction.input
diff --git a/test/implicit/1p/test_box1pniconvection.cc b/test/porousmediumflow/1p/implicit/test_box1pniconvection.cc
similarity index 100%
rename from test/implicit/1p/test_box1pniconvection.cc
rename to test/porousmediumflow/1p/implicit/test_box1pniconvection.cc
diff --git a/test/implicit/1p/test_box1pniconvection.input b/test/porousmediumflow/1p/implicit/test_box1pniconvection.input
similarity index 100%
rename from test/implicit/1p/test_box1pniconvection.input
rename to test/porousmediumflow/1p/implicit/test_box1pniconvection.input
diff --git a/test/implicit/1p/test_box1pwithamg.cc b/test/porousmediumflow/1p/implicit/test_box1pwithamg.cc
similarity index 100%
rename from test/implicit/1p/test_box1pwithamg.cc
rename to test/porousmediumflow/1p/implicit/test_box1pwithamg.cc
diff --git a/test/implicit/1p/test_box1pwithamg.input b/test/porousmediumflow/1p/implicit/test_box1pwithamg.input
similarity index 100%
rename from test/implicit/1p/test_box1pwithamg.input
rename to test/porousmediumflow/1p/implicit/test_box1pwithamg.input
diff --git a/test/implicit/1p/test_cc1p.cc b/test/porousmediumflow/1p/implicit/test_cc1p.cc
similarity index 100%
rename from test/implicit/1p/test_cc1p.cc
rename to test/porousmediumflow/1p/implicit/test_cc1p.cc
diff --git a/test/implicit/1p/test_cc1p.input b/test/porousmediumflow/1p/implicit/test_cc1p.input
similarity index 100%
rename from test/implicit/1p/test_cc1p.input
rename to test/porousmediumflow/1p/implicit/test_cc1p.input
diff --git a/test/implicit/1p/test_cc1p1d3d.cc b/test/porousmediumflow/1p/implicit/test_cc1p1d3d.cc
similarity index 100%
rename from test/implicit/1p/test_cc1p1d3d.cc
rename to test/porousmediumflow/1p/implicit/test_cc1p1d3d.cc
diff --git a/test/implicit/1p/test_cc1p1d3d.input b/test/porousmediumflow/1p/implicit/test_cc1p1d3d.input
similarity index 100%
rename from test/implicit/1p/test_cc1p1d3d.input
rename to test/porousmediumflow/1p/implicit/test_cc1p1d3d.input
diff --git a/test/implicit/1p/test_cc1p2d3d.cc b/test/porousmediumflow/1p/implicit/test_cc1p2d3d.cc
similarity index 100%
rename from test/implicit/1p/test_cc1p2d3d.cc
rename to test/porousmediumflow/1p/implicit/test_cc1p2d3d.cc
diff --git a/test/implicit/1p/test_cc1p2d3d.input b/test/porousmediumflow/1p/implicit/test_cc1p2d3d.input
similarity index 100%
rename from test/implicit/1p/test_cc1p2d3d.input
rename to test/porousmediumflow/1p/implicit/test_cc1p2d3d.input
diff --git a/test/implicit/1p/test_cc1pniconduction.cc b/test/porousmediumflow/1p/implicit/test_cc1pniconduction.cc
similarity index 100%
rename from test/implicit/1p/test_cc1pniconduction.cc
rename to test/porousmediumflow/1p/implicit/test_cc1pniconduction.cc
diff --git a/test/implicit/1p/test_cc1pniconduction.input b/test/porousmediumflow/1p/implicit/test_cc1pniconduction.input
similarity index 100%
rename from test/implicit/1p/test_cc1pniconduction.input
rename to test/porousmediumflow/1p/implicit/test_cc1pniconduction.input
diff --git a/test/implicit/1p/test_cc1pniconvection.cc b/test/porousmediumflow/1p/implicit/test_cc1pniconvection.cc
similarity index 100%
rename from test/implicit/1p/test_cc1pniconvection.cc
rename to test/porousmediumflow/1p/implicit/test_cc1pniconvection.cc
diff --git a/test/implicit/1p/test_cc1pniconvection.input b/test/porousmediumflow/1p/implicit/test_cc1pniconvection.input
similarity index 100%
rename from test/implicit/1p/test_cc1pniconvection.input
rename to test/porousmediumflow/1p/implicit/test_cc1pniconvection.input
diff --git a/test/implicit/1p/test_cc1pwithamg.cc b/test/porousmediumflow/1p/implicit/test_cc1pwithamg.cc
similarity index 100%
rename from test/implicit/1p/test_cc1pwithamg.cc
rename to test/porousmediumflow/1p/implicit/test_cc1pwithamg.cc
diff --git a/test/implicit/1p/test_cc1pwithamg.input b/test/porousmediumflow/1p/implicit/test_cc1pwithamg.input
similarity index 100%
rename from test/implicit/1p/test_cc1pwithamg.input
rename to test/porousmediumflow/1p/implicit/test_cc1pwithamg.input
diff --git a/test/decoupled/1p/CMakeLists.txt b/test/porousmediumflow/1p/sequential/CMakeLists.txt
similarity index 100%
rename from test/decoupled/1p/CMakeLists.txt
rename to test/porousmediumflow/1p/sequential/CMakeLists.txt
diff --git a/test/decoupled/1p/grids/test_diffusion3d_sg.dgf b/test/porousmediumflow/1p/sequential/grids/test_diffusion3d_sg.dgf
similarity index 100%
rename from test/decoupled/1p/grids/test_diffusion3d_sg.dgf
rename to test/porousmediumflow/1p/sequential/grids/test_diffusion3d_sg.dgf
diff --git a/test/decoupled/1p/grids/test_diffusion3d_ug1.dgf b/test/porousmediumflow/1p/sequential/grids/test_diffusion3d_ug1.dgf
similarity index 100%
rename from test/decoupled/1p/grids/test_diffusion3d_ug1.dgf
rename to test/porousmediumflow/1p/sequential/grids/test_diffusion3d_ug1.dgf
diff --git a/test/decoupled/1p/grids/test_diffusion3d_ug2.dgf b/test/porousmediumflow/1p/sequential/grids/test_diffusion3d_ug2.dgf
similarity index 100%
rename from test/decoupled/1p/grids/test_diffusion3d_ug2.dgf
rename to test/porousmediumflow/1p/sequential/grids/test_diffusion3d_ug2.dgf
diff --git a/test/decoupled/1p/resultevaluation.hh b/test/porousmediumflow/1p/sequential/resultevaluation.hh
similarity index 100%
rename from test/decoupled/1p/resultevaluation.hh
rename to test/porousmediumflow/1p/sequential/resultevaluation.hh
diff --git a/test/decoupled/1p/resultevaluation3d.hh b/test/porousmediumflow/1p/sequential/resultevaluation3d.hh
similarity index 100%
rename from test/decoupled/1p/resultevaluation3d.hh
rename to test/porousmediumflow/1p/sequential/resultevaluation3d.hh
diff --git a/test/decoupled/1p/test_1p.cc b/test/porousmediumflow/1p/sequential/test_1p.cc
similarity index 100%
rename from test/decoupled/1p/test_1p.cc
rename to test/porousmediumflow/1p/sequential/test_1p.cc
diff --git a/test/decoupled/1p/test_1p.input b/test/porousmediumflow/1p/sequential/test_1p.input
similarity index 100%
rename from test/decoupled/1p/test_1p.input
rename to test/porousmediumflow/1p/sequential/test_1p.input
diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
similarity index 100%
rename from test/decoupled/1p/test_1pproblem.hh
rename to test/porousmediumflow/1p/sequential/test_1pproblem.hh
diff --git a/test/decoupled/1p/test_1pspatialparams.hh b/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh
similarity index 100%
rename from test/decoupled/1p/test_1pspatialparams.hh
rename to test/porousmediumflow/1p/sequential/test_1pspatialparams.hh
diff --git a/test/decoupled/1p/test_diffusion.cc b/test/porousmediumflow/1p/sequential/test_diffusion.cc
similarity index 100%
rename from test/decoupled/1p/test_diffusion.cc
rename to test/porousmediumflow/1p/sequential/test_diffusion.cc
diff --git a/test/decoupled/1p/test_diffusion3d.cc b/test/porousmediumflow/1p/sequential/test_diffusion3d.cc
similarity index 100%
rename from test/decoupled/1p/test_diffusion3d.cc
rename to test/porousmediumflow/1p/sequential/test_diffusion3d.cc
diff --git a/test/decoupled/1p/test_diffusion3d.input b/test/porousmediumflow/1p/sequential/test_diffusion3d.input
similarity index 100%
rename from test/decoupled/1p/test_diffusion3d.input
rename to test/porousmediumflow/1p/sequential/test_diffusion3d.input
diff --git a/test/decoupled/1p/test_diffusion3d_reference.input b/test/porousmediumflow/1p/sequential/test_diffusion3d_reference.input
similarity index 100%
rename from test/decoupled/1p/test_diffusion3d_reference.input
rename to test/porousmediumflow/1p/sequential/test_diffusion3d_reference.input
diff --git a/test/decoupled/1p/test_diffusionproblem.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
similarity index 100%
rename from test/decoupled/1p/test_diffusionproblem.hh
rename to test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
diff --git a/test/decoupled/1p/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
similarity index 100%
rename from test/decoupled/1p/test_diffusionproblem3d.hh
rename to test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
diff --git a/test/decoupled/1p/test_diffusionspatialparams.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
similarity index 100%
rename from test/decoupled/1p/test_diffusionspatialparams.hh
rename to test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
diff --git a/test/decoupled/1p/test_diffusionspatialparams3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
similarity index 100%
rename from test/decoupled/1p/test_diffusionspatialparams3d.hh
rename to test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
diff --git a/test/porousmediumflow/1p2c/CMakeLists.txt b/test/porousmediumflow/1p2c/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/1p2c/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/1p2c/1p2cniconductionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
similarity index 100%
rename from test/implicit/1p2c/1p2cniconductionproblem.hh
rename to test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
diff --git a/test/implicit/1p2c/1p2cniconvectionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
similarity index 100%
rename from test/implicit/1p2c/1p2cniconvectionproblem.hh
rename to test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
diff --git a/test/implicit/1p2c/1p2cnispatialparams.hh b/test/porousmediumflow/1p2c/implicit/1p2cnispatialparams.hh
similarity index 100%
rename from test/implicit/1p2c/1p2cnispatialparams.hh
rename to test/porousmediumflow/1p2c/implicit/1p2cnispatialparams.hh
diff --git a/test/implicit/1p2c/1p2coutflowproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
similarity index 100%
rename from test/implicit/1p2c/1p2coutflowproblem.hh
rename to test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
diff --git a/test/implicit/1p2c/1p2coutflowspatialparams.hh b/test/porousmediumflow/1p2c/implicit/1p2coutflowspatialparams.hh
similarity index 100%
rename from test/implicit/1p2c/1p2coutflowspatialparams.hh
rename to test/porousmediumflow/1p2c/implicit/1p2coutflowspatialparams.hh
diff --git a/test/implicit/1p2c/CMakeLists.txt b/test/porousmediumflow/1p2c/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/1p2c/CMakeLists.txt
rename to test/porousmediumflow/1p2c/implicit/CMakeLists.txt
diff --git a/test/implicit/1p2c/grids/test_1p2c.dgf b/test/porousmediumflow/1p2c/implicit/grids/test_1p2c.dgf
similarity index 100%
rename from test/implicit/1p2c/grids/test_1p2c.dgf
rename to test/porousmediumflow/1p2c/implicit/grids/test_1p2c.dgf
diff --git a/test/implicit/1p2c/grids/test_1p2cniconduction.dgf b/test/porousmediumflow/1p2c/implicit/grids/test_1p2cniconduction.dgf
similarity index 100%
rename from test/implicit/1p2c/grids/test_1p2cniconduction.dgf
rename to test/porousmediumflow/1p2c/implicit/grids/test_1p2cniconduction.dgf
diff --git a/test/implicit/1p2c/grids/test_1p2cniconvection.dgf b/test/porousmediumflow/1p2c/implicit/grids/test_1p2cniconvection.dgf
similarity index 100%
rename from test/implicit/1p2c/grids/test_1p2cniconvection.dgf
rename to test/porousmediumflow/1p2c/implicit/grids/test_1p2cniconvection.dgf
diff --git a/test/implicit/1p2c/test_box1p2c.cc b/test/porousmediumflow/1p2c/implicit/test_box1p2c.cc
similarity index 100%
rename from test/implicit/1p2c/test_box1p2c.cc
rename to test/porousmediumflow/1p2c/implicit/test_box1p2c.cc
diff --git a/test/implicit/1p2c/test_box1p2c.input b/test/porousmediumflow/1p2c/implicit/test_box1p2c.input
similarity index 100%
rename from test/implicit/1p2c/test_box1p2c.input
rename to test/porousmediumflow/1p2c/implicit/test_box1p2c.input
diff --git a/test/implicit/1p2c/test_box1p2cniconduction.cc b/test/porousmediumflow/1p2c/implicit/test_box1p2cniconduction.cc
similarity index 100%
rename from test/implicit/1p2c/test_box1p2cniconduction.cc
rename to test/porousmediumflow/1p2c/implicit/test_box1p2cniconduction.cc
diff --git a/test/implicit/1p2c/test_box1p2cniconduction.input b/test/porousmediumflow/1p2c/implicit/test_box1p2cniconduction.input
similarity index 100%
rename from test/implicit/1p2c/test_box1p2cniconduction.input
rename to test/porousmediumflow/1p2c/implicit/test_box1p2cniconduction.input
diff --git a/test/implicit/1p2c/test_box1p2cniconvection.cc b/test/porousmediumflow/1p2c/implicit/test_box1p2cniconvection.cc
similarity index 100%
rename from test/implicit/1p2c/test_box1p2cniconvection.cc
rename to test/porousmediumflow/1p2c/implicit/test_box1p2cniconvection.cc
diff --git a/test/implicit/1p2c/test_box1p2cniconvection.input b/test/porousmediumflow/1p2c/implicit/test_box1p2cniconvection.input
similarity index 100%
rename from test/implicit/1p2c/test_box1p2cniconvection.input
rename to test/porousmediumflow/1p2c/implicit/test_box1p2cniconvection.input
diff --git a/test/implicit/1p2c/test_cc1p2c.cc b/test/porousmediumflow/1p2c/implicit/test_cc1p2c.cc
similarity index 100%
rename from test/implicit/1p2c/test_cc1p2c.cc
rename to test/porousmediumflow/1p2c/implicit/test_cc1p2c.cc
diff --git a/test/implicit/1p2c/test_cc1p2c.input b/test/porousmediumflow/1p2c/implicit/test_cc1p2c.input
similarity index 100%
rename from test/implicit/1p2c/test_cc1p2c.input
rename to test/porousmediumflow/1p2c/implicit/test_cc1p2c.input
diff --git a/test/implicit/1p2c/test_cc1p2cniconduction.cc b/test/porousmediumflow/1p2c/implicit/test_cc1p2cniconduction.cc
similarity index 100%
rename from test/implicit/1p2c/test_cc1p2cniconduction.cc
rename to test/porousmediumflow/1p2c/implicit/test_cc1p2cniconduction.cc
diff --git a/test/implicit/1p2c/test_cc1p2cniconduction.input b/test/porousmediumflow/1p2c/implicit/test_cc1p2cniconduction.input
similarity index 100%
rename from test/implicit/1p2c/test_cc1p2cniconduction.input
rename to test/porousmediumflow/1p2c/implicit/test_cc1p2cniconduction.input
diff --git a/test/implicit/1p2c/test_cc1p2cniconvection.cc b/test/porousmediumflow/1p2c/implicit/test_cc1p2cniconvection.cc
similarity index 100%
rename from test/implicit/1p2c/test_cc1p2cniconvection.cc
rename to test/porousmediumflow/1p2c/implicit/test_cc1p2cniconvection.cc
diff --git a/test/implicit/1p2c/test_cc1p2cniconvection.input b/test/porousmediumflow/1p2c/implicit/test_cc1p2cniconvection.input
similarity index 100%
rename from test/implicit/1p2c/test_cc1p2cniconvection.input
rename to test/porousmediumflow/1p2c/implicit/test_cc1p2cniconvection.input
diff --git a/test/porousmediumflow/2p/CMakeLists.txt b/test/porousmediumflow/2p/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fffa571735a25e9bb52347bd7e142ac034ac7c5d
--- /dev/null
+++ b/test/porousmediumflow/2p/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory("implicit")
+add_subdirectory("sequential")
diff --git a/test/implicit/2p/CMakeLists.txt b/test/porousmediumflow/2p/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/2p/CMakeLists.txt
rename to test/porousmediumflow/2p/implicit/CMakeLists.txt
diff --git a/test/implicit/2p/cc2pcornerpointproblem.hh b/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
similarity index 100%
rename from test/implicit/2p/cc2pcornerpointproblem.hh
rename to test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
diff --git a/test/implicit/2p/cc2pcornerpointspatialparams.hh b/test/porousmediumflow/2p/implicit/cc2pcornerpointspatialparams.hh
similarity index 100%
rename from test/implicit/2p/cc2pcornerpointspatialparams.hh
rename to test/porousmediumflow/2p/implicit/cc2pcornerpointspatialparams.hh
diff --git a/test/implicit/2p/generalizeddirichletproblem.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
similarity index 100%
rename from test/implicit/2p/generalizeddirichletproblem.hh
rename to test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
diff --git a/test/implicit/2p/generalizeddirichletspatialparams.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh
similarity index 100%
rename from test/implicit/2p/generalizeddirichletspatialparams.hh
rename to test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh
diff --git a/test/implicit/2p/grids/hardsmall.grdecl b/test/porousmediumflow/2p/implicit/grids/hardsmall.grdecl
similarity index 100%
rename from test/implicit/2p/grids/hardsmall.grdecl
rename to test/porousmediumflow/2p/implicit/grids/hardsmall.grdecl
diff --git a/test/implicit/2p/grids/test_2p.dgf b/test/porousmediumflow/2p/implicit/grids/test_2p.dgf
similarity index 100%
rename from test/implicit/2p/grids/test_2p.dgf
rename to test/porousmediumflow/2p/implicit/grids/test_2p.dgf
diff --git a/test/implicit/2p/grids/test_2pni.dgf b/test/porousmediumflow/2p/implicit/grids/test_2pni.dgf
similarity index 100%
rename from test/implicit/2p/grids/test_2pni.dgf
rename to test/porousmediumflow/2p/implicit/grids/test_2pni.dgf
diff --git a/test/implicit/2p/injectionproblem2pni.hh b/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
similarity index 99%
rename from test/implicit/2p/injectionproblem2pni.hh
rename to test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
index 34634cf455a11c08417fd1d6e63cafa390a848c2..9c48acca03a5e312b4596aa1531622103fd910c6 100644
--- a/test/implicit/2p/injectionproblem2pni.hh
+++ b/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
@@ -40,7 +40,7 @@
 
 // use the same spatial parameters as the injection problem of the
 // 2p2c test program
-#include "../2p2c/injectionspatialparams.hh"
+#include "test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh"
 
 #define ISOTHERMAL 0
 
diff --git a/test/implicit/2p/lensproblem.hh b/test/porousmediumflow/2p/implicit/lensproblem.hh
similarity index 100%
rename from test/implicit/2p/lensproblem.hh
rename to test/porousmediumflow/2p/implicit/lensproblem.hh
diff --git a/test/implicit/2p/lensspatialparams.hh b/test/porousmediumflow/2p/implicit/lensspatialparams.hh
similarity index 100%
rename from test/implicit/2p/lensspatialparams.hh
rename to test/porousmediumflow/2p/implicit/lensspatialparams.hh
diff --git a/test/implicit/2p/test_box2p.cc b/test/porousmediumflow/2p/implicit/test_box2p.cc
similarity index 100%
rename from test/implicit/2p/test_box2p.cc
rename to test/porousmediumflow/2p/implicit/test_box2p.cc
diff --git a/test/implicit/2p/test_box2p.input b/test/porousmediumflow/2p/implicit/test_box2p.input
similarity index 100%
rename from test/implicit/2p/test_box2p.input
rename to test/porousmediumflow/2p/implicit/test_box2p.input
diff --git a/test/implicit/2p/test_box2pni.cc b/test/porousmediumflow/2p/implicit/test_box2pni.cc
similarity index 100%
rename from test/implicit/2p/test_box2pni.cc
rename to test/porousmediumflow/2p/implicit/test_box2pni.cc
diff --git a/test/implicit/2p/test_box2pni.input b/test/porousmediumflow/2p/implicit/test_box2pni.input
similarity index 100%
rename from test/implicit/2p/test_box2pni.input
rename to test/porousmediumflow/2p/implicit/test_box2pni.input
diff --git a/test/implicit/2p/test_boxadaptive2p.cc b/test/porousmediumflow/2p/implicit/test_boxadaptive2p.cc
similarity index 100%
rename from test/implicit/2p/test_boxadaptive2p.cc
rename to test/porousmediumflow/2p/implicit/test_boxadaptive2p.cc
diff --git a/test/implicit/2p/test_boxadaptive2p.input b/test/porousmediumflow/2p/implicit/test_boxadaptive2p.input
similarity index 100%
rename from test/implicit/2p/test_boxadaptive2p.input
rename to test/porousmediumflow/2p/implicit/test_boxadaptive2p.input
diff --git a/test/implicit/2p/test_cc2p.cc b/test/porousmediumflow/2p/implicit/test_cc2p.cc
similarity index 100%
rename from test/implicit/2p/test_cc2p.cc
rename to test/porousmediumflow/2p/implicit/test_cc2p.cc
diff --git a/test/implicit/2p/test_cc2p.input b/test/porousmediumflow/2p/implicit/test_cc2p.input
similarity index 100%
rename from test/implicit/2p/test_cc2p.input
rename to test/porousmediumflow/2p/implicit/test_cc2p.input
diff --git a/test/implicit/2p/test_cc2pcornerpoint.cc b/test/porousmediumflow/2p/implicit/test_cc2pcornerpoint.cc
similarity index 100%
rename from test/implicit/2p/test_cc2pcornerpoint.cc
rename to test/porousmediumflow/2p/implicit/test_cc2pcornerpoint.cc
diff --git a/test/implicit/2p/test_cc2pcornerpoint.input b/test/porousmediumflow/2p/implicit/test_cc2pcornerpoint.input
similarity index 100%
rename from test/implicit/2p/test_cc2pcornerpoint.input
rename to test/porousmediumflow/2p/implicit/test_cc2pcornerpoint.input
diff --git a/test/implicit/2p/test_cc2pni.cc b/test/porousmediumflow/2p/implicit/test_cc2pni.cc
similarity index 100%
rename from test/implicit/2p/test_cc2pni.cc
rename to test/porousmediumflow/2p/implicit/test_cc2pni.cc
diff --git a/test/implicit/2p/test_cc2pni.input b/test/porousmediumflow/2p/implicit/test_cc2pni.input
similarity index 100%
rename from test/implicit/2p/test_cc2pni.input
rename to test/porousmediumflow/2p/implicit/test_cc2pni.input
diff --git a/test/implicit/2p/test_ccadaptive2p.cc b/test/porousmediumflow/2p/implicit/test_ccadaptive2p.cc
similarity index 100%
rename from test/implicit/2p/test_ccadaptive2p.cc
rename to test/porousmediumflow/2p/implicit/test_ccadaptive2p.cc
diff --git a/test/implicit/2p/test_ccadaptive2p.input b/test/porousmediumflow/2p/implicit/test_ccadaptive2p.input
similarity index 100%
rename from test/implicit/2p/test_ccadaptive2p.input
rename to test/porousmediumflow/2p/implicit/test_ccadaptive2p.input
diff --git a/test/implicit/2p/test_generalizeddirichlet.cc b/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc
similarity index 100%
rename from test/implicit/2p/test_generalizeddirichlet.cc
rename to test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc
diff --git a/test/implicit/2p/test_generalizeddirichlet.input b/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.input
similarity index 100%
rename from test/implicit/2p/test_generalizeddirichlet.input
rename to test/porousmediumflow/2p/implicit/test_generalizeddirichlet.input
diff --git a/test/decoupled/2p/CMakeLists.txt b/test/porousmediumflow/2p/sequential/CMakeLists.txt
similarity index 100%
rename from test/decoupled/2p/CMakeLists.txt
rename to test/porousmediumflow/2p/sequential/CMakeLists.txt
diff --git a/test/decoupled/2p/buckleyleverettanalyticsolution.hh b/test/porousmediumflow/2p/sequential/buckleyleverettanalyticsolution.hh
similarity index 100%
rename from test/decoupled/2p/buckleyleverettanalyticsolution.hh
rename to test/porousmediumflow/2p/sequential/buckleyleverettanalyticsolution.hh
diff --git a/test/decoupled/2p/grids/test_3d2p_12_sg.dgf b/test/porousmediumflow/2p/sequential/grids/test_3d2p_12_sg.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_3d2p_12_sg.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_3d2p_12_sg.dgf
diff --git a/test/decoupled/2p/grids/test_3d2p_12_ug.dgf b/test/porousmediumflow/2p/sequential/grids/test_3d2p_12_ug.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_3d2p_12_ug.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_3d2p_12_ug.dgf
diff --git a/test/decoupled/2p/grids/test_3d2p_3_sg.dgf b/test/porousmediumflow/2p/sequential/grids/test_3d2p_3_sg.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_3d2p_3_sg.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_3d2p_3_sg.dgf
diff --git a/test/decoupled/2p/grids/test_3d2p_3_ug1.dgf b/test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug1.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_3d2p_3_ug1.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug1.dgf
diff --git a/test/decoupled/2p/grids/test_3d2p_3_ug2.dgf b/test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug2.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_3d2p_3_ug2.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug2.dgf
diff --git a/test/decoupled/2p/grids/test_impeswithamg.dgf b/test/porousmediumflow/2p/sequential/grids/test_impeswithamg.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_impeswithamg.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_impeswithamg.dgf
diff --git a/test/decoupled/2p/grids/test_mpfa2p.dgf b/test/porousmediumflow/2p/sequential/grids/test_mpfa2p.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_mpfa2p.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_mpfa2p.dgf
diff --git a/test/decoupled/2p/grids/test_mpfa2p_sg.dgf b/test/porousmediumflow/2p/sequential/grids/test_mpfa2p_sg.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_mpfa2p_sg.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_mpfa2p_sg.dgf
diff --git a/test/decoupled/2p/grids/test_transport.dgf b/test/porousmediumflow/2p/sequential/grids/test_transport.dgf
similarity index 100%
rename from test/decoupled/2p/grids/test_transport.dgf
rename to test/porousmediumflow/2p/sequential/grids/test_transport.dgf
diff --git a/test/decoupled/2p/mcwhorteranalyticsolution.hh b/test/porousmediumflow/2p/sequential/mcwhorteranalyticsolution.hh
similarity index 100%
rename from test/decoupled/2p/mcwhorteranalyticsolution.hh
rename to test/porousmediumflow/2p/sequential/mcwhorteranalyticsolution.hh
diff --git a/test/decoupled/2p/test_3d2p.cc b/test/porousmediumflow/2p/sequential/test_3d2p.cc
similarity index 100%
rename from test/decoupled/2p/test_3d2p.cc
rename to test/porousmediumflow/2p/sequential/test_3d2p.cc
diff --git a/test/decoupled/2p/test_3d2p.input b/test/porousmediumflow/2p/sequential/test_3d2p.input
similarity index 100%
rename from test/decoupled/2p/test_3d2p.input
rename to test/porousmediumflow/2p/sequential/test_3d2p.input
diff --git a/test/decoupled/2p/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
similarity index 100%
rename from test/decoupled/2p/test_3d2pproblem.hh
rename to test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
diff --git a/test/decoupled/2p/test_3d2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
similarity index 100%
rename from test/decoupled/2p/test_3d2pspatialparams.hh
rename to test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
diff --git a/test/decoupled/2p/test_impes.cc b/test/porousmediumflow/2p/sequential/test_impes.cc
similarity index 100%
rename from test/decoupled/2p/test_impes.cc
rename to test/porousmediumflow/2p/sequential/test_impes.cc
diff --git a/test/decoupled/2p/test_impes.input b/test/porousmediumflow/2p/sequential/test_impes.input
similarity index 100%
rename from test/decoupled/2p/test_impes.input
rename to test/porousmediumflow/2p/sequential/test_impes.input
diff --git a/test/decoupled/2p/test_impesadaptive.cc b/test/porousmediumflow/2p/sequential/test_impesadaptive.cc
similarity index 100%
rename from test/decoupled/2p/test_impesadaptive.cc
rename to test/porousmediumflow/2p/sequential/test_impesadaptive.cc
diff --git a/test/decoupled/2p/test_impesadaptive.input b/test/porousmediumflow/2p/sequential/test_impesadaptive.input
similarity index 100%
rename from test/decoupled/2p/test_impesadaptive.input
rename to test/porousmediumflow/2p/sequential/test_impesadaptive.input
diff --git a/test/decoupled/2p/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
similarity index 100%
rename from test/decoupled/2p/test_impesadaptiveproblem.hh
rename to test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
diff --git a/test/decoupled/2p/test_impesadaptiverestart.cc b/test/porousmediumflow/2p/sequential/test_impesadaptiverestart.cc
similarity index 100%
rename from test/decoupled/2p/test_impesadaptiverestart.cc
rename to test/porousmediumflow/2p/sequential/test_impesadaptiverestart.cc
diff --git a/test/decoupled/2p/test_impesadaptiverestart.input b/test/porousmediumflow/2p/sequential/test_impesadaptiverestart.input
similarity index 100%
rename from test/decoupled/2p/test_impesadaptiverestart.input
rename to test/porousmediumflow/2p/sequential/test_impesadaptiverestart.input
diff --git a/test/decoupled/2p/test_impesadaptivespatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
similarity index 100%
rename from test/decoupled/2p/test_impesadaptivespatialparams.hh
rename to test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
diff --git a/test/decoupled/2p/test_impesproblem.hh b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
similarity index 100%
rename from test/decoupled/2p/test_impesproblem.hh
rename to test/porousmediumflow/2p/sequential/test_impesproblem.hh
diff --git a/test/decoupled/2p/test_impesspatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
similarity index 100%
rename from test/decoupled/2p/test_impesspatialparams.hh
rename to test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
diff --git a/test/decoupled/2p/test_impeswithamg.cc b/test/porousmediumflow/2p/sequential/test_impeswithamg.cc
similarity index 100%
rename from test/decoupled/2p/test_impeswithamg.cc
rename to test/porousmediumflow/2p/sequential/test_impeswithamg.cc
diff --git a/test/decoupled/2p/test_impeswithamg.input b/test/porousmediumflow/2p/sequential/test_impeswithamg.input
similarity index 100%
rename from test/decoupled/2p/test_impeswithamg.input
rename to test/porousmediumflow/2p/sequential/test_impeswithamg.input
diff --git a/test/decoupled/2p/test_mpfa2p.cc b/test/porousmediumflow/2p/sequential/test_mpfa2p.cc
similarity index 100%
rename from test/decoupled/2p/test_mpfa2p.cc
rename to test/porousmediumflow/2p/sequential/test_mpfa2p.cc
diff --git a/test/decoupled/2p/test_mpfa2p.input b/test/porousmediumflow/2p/sequential/test_mpfa2p.input
similarity index 100%
rename from test/decoupled/2p/test_mpfa2p.input
rename to test/porousmediumflow/2p/sequential/test_mpfa2p.input
diff --git a/test/decoupled/2p/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
similarity index 100%
rename from test/decoupled/2p/test_mpfa2pproblem.hh
rename to test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
diff --git a/test/decoupled/2p/test_mpfa2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
similarity index 100%
rename from test/decoupled/2p/test_mpfa2pspatialparams.hh
rename to test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
diff --git a/test/decoupled/2p/test_transport.cc b/test/porousmediumflow/2p/sequential/test_transport.cc
similarity index 100%
rename from test/decoupled/2p/test_transport.cc
rename to test/porousmediumflow/2p/sequential/test_transport.cc
diff --git a/test/decoupled/2p/test_transport.input b/test/porousmediumflow/2p/sequential/test_transport.input
similarity index 100%
rename from test/decoupled/2p/test_transport.input
rename to test/porousmediumflow/2p/sequential/test_transport.input
diff --git a/test/decoupled/2p/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
similarity index 100%
rename from test/decoupled/2p/test_transportproblem.hh
rename to test/porousmediumflow/2p/sequential/test_transportproblem.hh
diff --git a/test/decoupled/2p/test_transportspatialparams.hh b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
similarity index 100%
rename from test/decoupled/2p/test_transportspatialparams.hh
rename to test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
diff --git a/test/porousmediumflow/2p2c/CMakeLists.txt b/test/porousmediumflow/2p2c/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fffa571735a25e9bb52347bd7e142ac034ac7c5d
--- /dev/null
+++ b/test/porousmediumflow/2p2c/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory("implicit")
+add_subdirectory("sequential")
diff --git a/test/implicit/2p2c/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/2p2c/CMakeLists.txt
rename to test/porousmediumflow/2p2c/implicit/CMakeLists.txt
diff --git a/test/implicit/2p2c/grids/test_2p2c.dgf b/test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf
similarity index 100%
rename from test/implicit/2p2c/grids/test_2p2c.dgf
rename to test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf
diff --git a/test/implicit/2p2c/grids/test_2p2cni.dgf b/test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf
similarity index 100%
rename from test/implicit/2p2c/grids/test_2p2cni.dgf
rename to test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf
diff --git a/test/implicit/2p2c/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
similarity index 100%
rename from test/implicit/2p2c/injectionproblem.hh
rename to test/porousmediumflow/2p2c/implicit/injectionproblem.hh
diff --git a/test/implicit/2p2c/injectionspatialparams.hh b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
similarity index 100%
rename from test/implicit/2p2c/injectionspatialparams.hh
rename to test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
diff --git a/test/implicit/2p2c/test_box2p2c.cc b/test/porousmediumflow/2p2c/implicit/test_box2p2c.cc
similarity index 100%
rename from test/implicit/2p2c/test_box2p2c.cc
rename to test/porousmediumflow/2p2c/implicit/test_box2p2c.cc
diff --git a/test/implicit/2p2c/test_box2p2c.input b/test/porousmediumflow/2p2c/implicit/test_box2p2c.input
similarity index 100%
rename from test/implicit/2p2c/test_box2p2c.input
rename to test/porousmediumflow/2p2c/implicit/test_box2p2c.input
diff --git a/test/implicit/2p2c/test_box2p2cni.cc b/test/porousmediumflow/2p2c/implicit/test_box2p2cni.cc
similarity index 100%
rename from test/implicit/2p2c/test_box2p2cni.cc
rename to test/porousmediumflow/2p2c/implicit/test_box2p2cni.cc
diff --git a/test/implicit/2p2c/test_box2p2cni.input b/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
similarity index 100%
rename from test/implicit/2p2c/test_box2p2cni.input
rename to test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
diff --git a/test/implicit/2p2c/test_box2p2cni_reference.input b/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
similarity index 100%
rename from test/implicit/2p2c/test_box2p2cni_reference.input
rename to test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
diff --git a/test/implicit/2p2c/test_cc2p2c.cc b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.cc
similarity index 100%
rename from test/implicit/2p2c/test_cc2p2c.cc
rename to test/porousmediumflow/2p2c/implicit/test_cc2p2c.cc
diff --git a/test/implicit/2p2c/test_cc2p2c.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
similarity index 100%
rename from test/implicit/2p2c/test_cc2p2c.input
rename to test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
diff --git a/test/implicit/2p2c/test_cc2p2cni.cc b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.cc
similarity index 100%
rename from test/implicit/2p2c/test_cc2p2cni.cc
rename to test/porousmediumflow/2p2c/implicit/test_cc2p2cni.cc
diff --git a/test/implicit/2p2c/test_cc2p2cni.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
similarity index 100%
rename from test/implicit/2p2c/test_cc2p2cni.input
rename to test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
diff --git a/test/implicit/2p2c/test_cc2p2cni_reference.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
similarity index 100%
rename from test/implicit/2p2c/test_cc2p2cni_reference.input
rename to test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
diff --git a/test/implicit/2p2c/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
similarity index 100%
rename from test/implicit/2p2c/waterairproblem.hh
rename to test/porousmediumflow/2p2c/implicit/waterairproblem.hh
diff --git a/test/implicit/2p2c/waterairspatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
similarity index 100%
rename from test/implicit/2p2c/waterairspatialparams.hh
rename to test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
diff --git a/test/decoupled/2p2c/CMakeLists.txt b/test/porousmediumflow/2p2c/sequential/CMakeLists.txt
similarity index 100%
rename from test/decoupled/2p2c/CMakeLists.txt
rename to test/porousmediumflow/2p2c/sequential/CMakeLists.txt
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2d.cc b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.cc
similarity index 100%
rename from test/decoupled/2p2c/test_adaptive2p2c2d.cc
rename to test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.cc
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2d.input b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.input
similarity index 100%
rename from test/decoupled/2p2c/test_adaptive2p2c2d.input
rename to test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.input
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
similarity index 100%
rename from test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
rename to test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
diff --git a/test/decoupled/2p2c/test_adaptive2p2c3d.cc b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3d.cc
similarity index 100%
rename from test/decoupled/2p2c/test_adaptive2p2c3d.cc
rename to test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3d.cc
diff --git a/test/decoupled/2p2c/test_adaptive2p2c3d.input b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3d.input
similarity index 100%
rename from test/decoupled/2p2c/test_adaptive2p2c3d.input
rename to test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3d.input
diff --git a/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
similarity index 100%
rename from test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh
rename to test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
diff --git a/test/decoupled/2p2c/test_dec2p2c.cc b/test/porousmediumflow/2p2c/sequential/test_dec2p2c.cc
similarity index 100%
rename from test/decoupled/2p2c/test_dec2p2c.cc
rename to test/porousmediumflow/2p2c/sequential/test_dec2p2c.cc
diff --git a/test/decoupled/2p2c/test_dec2p2c.input b/test/porousmediumflow/2p2c/sequential/test_dec2p2c.input
similarity index 100%
rename from test/decoupled/2p2c/test_dec2p2c.input
rename to test/porousmediumflow/2p2c/sequential/test_dec2p2c.input
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
similarity index 100%
rename from test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
rename to test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
similarity index 100%
rename from test/decoupled/2p2c/test_dec2p2cproblem.hh
rename to test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
diff --git a/test/decoupled/2p2c/test_multiphysics2p2c.cc b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2c.cc
similarity index 100%
rename from test/decoupled/2p2c/test_multiphysics2p2c.cc
rename to test/porousmediumflow/2p2c/sequential/test_multiphysics2p2c.cc
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
similarity index 100%
rename from test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
rename to test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
diff --git a/test/porousmediumflow/2pdfm/CMakeLists.txt b/test/porousmediumflow/2pdfm/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/2pdfm/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/2pdfm/2pdfmspatialparams.hh b/test/porousmediumflow/2pdfm/implicit/2pdfmspatialparams.hh
similarity index 100%
rename from test/implicit/2pdfm/2pdfmspatialparams.hh
rename to test/porousmediumflow/2pdfm/implicit/2pdfmspatialparams.hh
diff --git a/test/implicit/2pdfm/2pdfmtestproblem.hh b/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
similarity index 100%
rename from test/implicit/2pdfm/2pdfmtestproblem.hh
rename to test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
diff --git a/test/implicit/2pdfm/CMakeLists.txt b/test/porousmediumflow/2pdfm/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/2pdfm/CMakeLists.txt
rename to test/porousmediumflow/2pdfm/implicit/CMakeLists.txt
diff --git a/test/implicit/2pdfm/grids/2pdfmartmesh.net b/test/porousmediumflow/2pdfm/implicit/grids/2pdfmartmesh.net
similarity index 100%
rename from test/implicit/2pdfm/grids/2pdfmartmesh.net
rename to test/porousmediumflow/2pdfm/implicit/grids/2pdfmartmesh.net
diff --git a/test/implicit/2pdfm/test_2pdfm.cc b/test/porousmediumflow/2pdfm/implicit/test_2pdfm.cc
similarity index 100%
rename from test/implicit/2pdfm/test_2pdfm.cc
rename to test/porousmediumflow/2pdfm/implicit/test_2pdfm.cc
diff --git a/test/implicit/2pdfm/test_2pdfm.input b/test/porousmediumflow/2pdfm/implicit/test_2pdfm.input
similarity index 100%
rename from test/implicit/2pdfm/test_2pdfm.input
rename to test/porousmediumflow/2pdfm/implicit/test_2pdfm.input
diff --git a/test/porousmediumflow/2pminc/CMakeLists.txt b/test/porousmediumflow/2pminc/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/2pminc/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/2pminc/2pminctestproblem.hh b/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
similarity index 100%
rename from test/implicit/2pminc/2pminctestproblem.hh
rename to test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
diff --git a/test/implicit/2pminc/2pminctestspatialparams.hh b/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
similarity index 100%
rename from test/implicit/2pminc/2pminctestspatialparams.hh
rename to test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
diff --git a/test/implicit/2pminc/CMakeLists.txt b/test/porousmediumflow/2pminc/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/2pminc/CMakeLists.txt
rename to test/porousmediumflow/2pminc/implicit/CMakeLists.txt
diff --git a/test/implicit/2pminc/test_box2pminc.cc b/test/porousmediumflow/2pminc/implicit/test_box2pminc.cc
similarity index 100%
rename from test/implicit/2pminc/test_box2pminc.cc
rename to test/porousmediumflow/2pminc/implicit/test_box2pminc.cc
diff --git a/test/implicit/2pminc/test_box2pmincdist.input b/test/porousmediumflow/2pminc/implicit/test_box2pmincdist.input
similarity index 100%
rename from test/implicit/2pminc/test_box2pmincdist.input
rename to test/porousmediumflow/2pminc/implicit/test_box2pmincdist.input
diff --git a/test/implicit/2pminc/test_box2pmincvol.input b/test/porousmediumflow/2pminc/implicit/test_box2pmincvol.input
similarity index 100%
rename from test/implicit/2pminc/test_box2pmincvol.input
rename to test/porousmediumflow/2pminc/implicit/test_box2pmincvol.input
diff --git a/test/porousmediumflow/2pnc/CMakeLists.txt b/test/porousmediumflow/2pnc/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/2pnc/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/2pnc/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/2pnc/CMakeLists.txt
rename to test/porousmediumflow/2pnc/implicit/CMakeLists.txt
diff --git a/test/implicit/2pnc/fuelcellproblem.hh b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
similarity index 100%
rename from test/implicit/2pnc/fuelcellproblem.hh
rename to test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
diff --git a/test/implicit/2pnc/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
similarity index 100%
rename from test/implicit/2pnc/fuelcellspatialparams.hh
rename to test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
diff --git a/test/implicit/2pnc/test_box2pnc.cc b/test/porousmediumflow/2pnc/implicit/test_box2pnc.cc
similarity index 100%
rename from test/implicit/2pnc/test_box2pnc.cc
rename to test/porousmediumflow/2pnc/implicit/test_box2pnc.cc
diff --git a/test/implicit/2pnc/test_box2pnc.input b/test/porousmediumflow/2pnc/implicit/test_box2pnc.input
similarity index 100%
rename from test/implicit/2pnc/test_box2pnc.input
rename to test/porousmediumflow/2pnc/implicit/test_box2pnc.input
diff --git a/test/porousmediumflow/2pncmin/CMakeLists.txt b/test/porousmediumflow/2pncmin/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/2pncmin/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/2pncmin/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/2pncmin/CMakeLists.txt
rename to test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
diff --git a/test/implicit/2pncmin/dissolutionproblem.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
similarity index 100%
rename from test/implicit/2pncmin/dissolutionproblem.hh
rename to test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
diff --git a/test/implicit/2pncmin/dissolutionspatialparams.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
similarity index 100%
rename from test/implicit/2pncmin/dissolutionspatialparams.hh
rename to test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
diff --git a/test/implicit/2pncmin/grids/test_2pncmin.dgf b/test/porousmediumflow/2pncmin/implicit/grids/test_2pncmin.dgf
similarity index 100%
rename from test/implicit/2pncmin/grids/test_2pncmin.dgf
rename to test/porousmediumflow/2pncmin/implicit/grids/test_2pncmin.dgf
diff --git a/test/implicit/2pncmin/test_box2pncmin.cc b/test/porousmediumflow/2pncmin/implicit/test_box2pncmin.cc
similarity index 100%
rename from test/implicit/2pncmin/test_box2pncmin.cc
rename to test/porousmediumflow/2pncmin/implicit/test_box2pncmin.cc
diff --git a/test/implicit/2pncmin/test_box2pncmin.input b/test/porousmediumflow/2pncmin/implicit/test_box2pncmin.input
similarity index 100%
rename from test/implicit/2pncmin/test_box2pncmin.input
rename to test/porousmediumflow/2pncmin/implicit/test_box2pncmin.input
diff --git a/test/porousmediumflow/3p/CMakeLists.txt b/test/porousmediumflow/3p/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/3p/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/3p/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
similarity index 100%
rename from test/implicit/3p/3pniconductionproblem.hh
rename to test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
diff --git a/test/implicit/3p/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
similarity index 100%
rename from test/implicit/3p/3pniconvectionproblem.hh
rename to test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
diff --git a/test/implicit/3p/3pnispatialparams.hh b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
similarity index 100%
rename from test/implicit/3p/3pnispatialparams.hh
rename to test/porousmediumflow/3p/implicit/3pnispatialparams.hh
diff --git a/test/implicit/3p/CMakeLists.txt b/test/porousmediumflow/3p/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/3p/CMakeLists.txt
rename to test/porousmediumflow/3p/implicit/CMakeLists.txt
diff --git a/test/implicit/3p/grids/infiltration3p.dgf b/test/porousmediumflow/3p/implicit/grids/infiltration3p.dgf
similarity index 100%
rename from test/implicit/3p/grids/infiltration3p.dgf
rename to test/porousmediumflow/3p/implicit/grids/infiltration3p.dgf
diff --git a/test/implicit/3p/grids/test_3pniconduction.dgf b/test/porousmediumflow/3p/implicit/grids/test_3pniconduction.dgf
similarity index 100%
rename from test/implicit/3p/grids/test_3pniconduction.dgf
rename to test/porousmediumflow/3p/implicit/grids/test_3pniconduction.dgf
diff --git a/test/implicit/3p/grids/test_3pniconvection.dgf b/test/porousmediumflow/3p/implicit/grids/test_3pniconvection.dgf
similarity index 100%
rename from test/implicit/3p/grids/test_3pniconvection.dgf
rename to test/porousmediumflow/3p/implicit/grids/test_3pniconvection.dgf
diff --git a/test/implicit/3p/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
similarity index 100%
rename from test/implicit/3p/infiltration3pproblem.hh
rename to test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
diff --git a/test/implicit/3p/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
similarity index 100%
rename from test/implicit/3p/infiltration3pspatialparams.hh
rename to test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
diff --git a/test/implicit/3p/test_box3p.cc b/test/porousmediumflow/3p/implicit/test_box3p.cc
similarity index 100%
rename from test/implicit/3p/test_box3p.cc
rename to test/porousmediumflow/3p/implicit/test_box3p.cc
diff --git a/test/implicit/3p/test_box3p.input b/test/porousmediumflow/3p/implicit/test_box3p.input
similarity index 100%
rename from test/implicit/3p/test_box3p.input
rename to test/porousmediumflow/3p/implicit/test_box3p.input
diff --git a/test/implicit/3p/test_box3pniconduction.cc b/test/porousmediumflow/3p/implicit/test_box3pniconduction.cc
similarity index 100%
rename from test/implicit/3p/test_box3pniconduction.cc
rename to test/porousmediumflow/3p/implicit/test_box3pniconduction.cc
diff --git a/test/implicit/3p/test_box3pniconduction.input b/test/porousmediumflow/3p/implicit/test_box3pniconduction.input
similarity index 100%
rename from test/implicit/3p/test_box3pniconduction.input
rename to test/porousmediumflow/3p/implicit/test_box3pniconduction.input
diff --git a/test/implicit/3p/test_box3pniconvection.cc b/test/porousmediumflow/3p/implicit/test_box3pniconvection.cc
similarity index 100%
rename from test/implicit/3p/test_box3pniconvection.cc
rename to test/porousmediumflow/3p/implicit/test_box3pniconvection.cc
diff --git a/test/implicit/3p/test_box3pniconvection.input b/test/porousmediumflow/3p/implicit/test_box3pniconvection.input
similarity index 100%
rename from test/implicit/3p/test_box3pniconvection.input
rename to test/porousmediumflow/3p/implicit/test_box3pniconvection.input
diff --git a/test/implicit/3p/test_cc3p.cc b/test/porousmediumflow/3p/implicit/test_cc3p.cc
similarity index 100%
rename from test/implicit/3p/test_cc3p.cc
rename to test/porousmediumflow/3p/implicit/test_cc3p.cc
diff --git a/test/implicit/3p/test_cc3p.input b/test/porousmediumflow/3p/implicit/test_cc3p.input
similarity index 100%
rename from test/implicit/3p/test_cc3p.input
rename to test/porousmediumflow/3p/implicit/test_cc3p.input
diff --git a/test/implicit/3p/test_cc3pniconduction.cc b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.cc
similarity index 100%
rename from test/implicit/3p/test_cc3pniconduction.cc
rename to test/porousmediumflow/3p/implicit/test_cc3pniconduction.cc
diff --git a/test/implicit/3p/test_cc3pniconduction.input b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
similarity index 100%
rename from test/implicit/3p/test_cc3pniconduction.input
rename to test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
diff --git a/test/implicit/3p/test_cc3pniconvection.cc b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.cc
similarity index 100%
rename from test/implicit/3p/test_cc3pniconvection.cc
rename to test/porousmediumflow/3p/implicit/test_cc3pniconvection.cc
diff --git a/test/implicit/3p/test_cc3pniconvection.input b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
similarity index 100%
rename from test/implicit/3p/test_cc3pniconvection.input
rename to test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
diff --git a/test/porousmediumflow/3p3c/CMakeLists.txt b/test/porousmediumflow/3p3c/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/3p3c/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/3p3c/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/3p3c/CMakeLists.txt
rename to test/porousmediumflow/3p3c/implicit/CMakeLists.txt
diff --git a/test/implicit/3p3c/columnxylolproblem.hh b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
similarity index 100%
rename from test/implicit/3p3c/columnxylolproblem.hh
rename to test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
diff --git a/test/implicit/3p3c/columnxylolspatialparams.hh b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
similarity index 100%
rename from test/implicit/3p3c/columnxylolspatialparams.hh
rename to test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
diff --git a/test/implicit/3p3c/grids/column.dgf b/test/porousmediumflow/3p3c/implicit/grids/column.dgf
similarity index 100%
rename from test/implicit/3p3c/grids/column.dgf
rename to test/porousmediumflow/3p3c/implicit/grids/column.dgf
diff --git a/test/implicit/3p3c/grids/kuev_3p3cni.dgf b/test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf
similarity index 100%
rename from test/implicit/3p3c/grids/kuev_3p3cni.dgf
rename to test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf
diff --git a/test/implicit/3p3c/grids/test_3p3c.dgf b/test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf
similarity index 100%
rename from test/implicit/3p3c/grids/test_3p3c.dgf
rename to test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf
diff --git a/test/implicit/3p3c/grids/test_3p3c_coarse.dgf b/test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf
similarity index 100%
rename from test/implicit/3p3c/grids/test_3p3c_coarse.dgf
rename to test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf
diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
similarity index 100%
rename from test/implicit/3p3c/infiltrationproblem.hh
rename to test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
diff --git a/test/implicit/3p3c/infiltrationspatialparameters.hh b/test/porousmediumflow/3p3c/implicit/infiltrationspatialparameters.hh
similarity index 100%
rename from test/implicit/3p3c/infiltrationspatialparameters.hh
rename to test/porousmediumflow/3p3c/implicit/infiltrationspatialparameters.hh
diff --git a/test/implicit/3p3c/kuevetteproblem.hh b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
similarity index 100%
rename from test/implicit/3p3c/kuevetteproblem.hh
rename to test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
diff --git a/test/implicit/3p3c/kuevettespatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
similarity index 100%
rename from test/implicit/3p3c/kuevettespatialparams.hh
rename to test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
diff --git a/test/implicit/3p3c/test_box3p3c.cc b/test/porousmediumflow/3p3c/implicit/test_box3p3c.cc
similarity index 100%
rename from test/implicit/3p3c/test_box3p3c.cc
rename to test/porousmediumflow/3p3c/implicit/test_box3p3c.cc
diff --git a/test/implicit/3p3c/test_box3p3c.input b/test/porousmediumflow/3p3c/implicit/test_box3p3c.input
similarity index 100%
rename from test/implicit/3p3c/test_box3p3c.input
rename to test/porousmediumflow/3p3c/implicit/test_box3p3c.input
diff --git a/test/implicit/3p3c/test_box3p3c_reference.input b/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input
similarity index 100%
rename from test/implicit/3p3c/test_box3p3c_reference.input
rename to test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input
diff --git a/test/implicit/3p3c/test_box3p3cnicolumnxylol.cc b/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.cc
similarity index 100%
rename from test/implicit/3p3c/test_box3p3cnicolumnxylol.cc
rename to test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.cc
diff --git a/test/implicit/3p3c/test_box3p3cnicolumnxylol.input b/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input
similarity index 100%
rename from test/implicit/3p3c/test_box3p3cnicolumnxylol.input
rename to test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input
diff --git a/test/implicit/3p3c/test_box3p3cnikuevette.cc b/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.cc
similarity index 100%
rename from test/implicit/3p3c/test_box3p3cnikuevette.cc
rename to test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.cc
diff --git a/test/implicit/3p3c/test_box3p3cnikuevette.input b/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input
similarity index 100%
rename from test/implicit/3p3c/test_box3p3cnikuevette.input
rename to test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input
diff --git a/test/implicit/3p3c/test_cc3p3c.cc b/test/porousmediumflow/3p3c/implicit/test_cc3p3c.cc
similarity index 100%
rename from test/implicit/3p3c/test_cc3p3c.cc
rename to test/porousmediumflow/3p3c/implicit/test_cc3p3c.cc
diff --git a/test/implicit/3p3c/test_cc3p3c.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input
similarity index 100%
rename from test/implicit/3p3c/test_cc3p3c.input
rename to test/porousmediumflow/3p3c/implicit/test_cc3p3c.input
diff --git a/test/implicit/3p3c/test_cc3p3c_reference.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input
similarity index 100%
rename from test/implicit/3p3c/test_cc3p3c_reference.input
rename to test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input
diff --git a/test/implicit/3p3c/test_cc3p3cnicolumnxylol.cc b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.cc
similarity index 100%
rename from test/implicit/3p3c/test_cc3p3cnicolumnxylol.cc
rename to test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.cc
diff --git a/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input
similarity index 100%
rename from test/implicit/3p3c/test_cc3p3cnicolumnxylol.input
rename to test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input
diff --git a/test/implicit/3p3c/test_cc3p3cnikuevette.cc b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.cc
similarity index 100%
rename from test/implicit/3p3c/test_cc3p3cnikuevette.cc
rename to test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.cc
diff --git a/test/implicit/3p3c/test_cc3p3cnikuevette.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input
similarity index 100%
rename from test/implicit/3p3c/test_cc3p3cnikuevette.input
rename to test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input
diff --git a/test/implicit/CMakeLists.txt b/test/porousmediumflow/CMakeLists.txt
similarity index 100%
rename from test/implicit/CMakeLists.txt
rename to test/porousmediumflow/CMakeLists.txt
diff --git a/test/porousmediumflow/co2/CMakeLists.txt b/test/porousmediumflow/co2/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/co2/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/co2/CMakeLists.txt b/test/porousmediumflow/co2/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/co2/CMakeLists.txt
rename to test/porousmediumflow/co2/implicit/CMakeLists.txt
diff --git a/test/implicit/co2/boxt1e9.vtu b/test/porousmediumflow/co2/implicit/boxt1e9.vtu
similarity index 100%
rename from test/implicit/co2/boxt1e9.vtu
rename to test/porousmediumflow/co2/implicit/boxt1e9.vtu
diff --git a/test/implicit/co2/cct1e9.vtu b/test/porousmediumflow/co2/implicit/cct1e9.vtu
similarity index 100%
rename from test/implicit/co2/cct1e9.vtu
rename to test/porousmediumflow/co2/implicit/cct1e9.vtu
diff --git a/test/implicit/co2/co2values.inc b/test/porousmediumflow/co2/implicit/co2values.inc
similarity index 100%
rename from test/implicit/co2/co2values.inc
rename to test/porousmediumflow/co2/implicit/co2values.inc
diff --git a/test/implicit/co2/grids/heterogeneousSmall.dgf b/test/porousmediumflow/co2/implicit/grids/heterogeneousSmall.dgf
similarity index 100%
rename from test/implicit/co2/grids/heterogeneousSmall.dgf
rename to test/porousmediumflow/co2/implicit/grids/heterogeneousSmall.dgf
diff --git a/test/implicit/co2/heterogeneousco2tables.hh b/test/porousmediumflow/co2/implicit/heterogeneousco2tables.hh
similarity index 100%
rename from test/implicit/co2/heterogeneousco2tables.hh
rename to test/porousmediumflow/co2/implicit/heterogeneousco2tables.hh
diff --git a/test/implicit/co2/heterogeneousproblem.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
similarity index 100%
rename from test/implicit/co2/heterogeneousproblem.hh
rename to test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
diff --git a/test/implicit/co2/heterogeneousproblemni.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
similarity index 100%
rename from test/implicit/co2/heterogeneousproblemni.hh
rename to test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
diff --git a/test/implicit/co2/heterogeneousspatialparameters.hh b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
similarity index 100%
rename from test/implicit/co2/heterogeneousspatialparameters.hh
rename to test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
diff --git a/test/implicit/co2/test_boxco2.cc b/test/porousmediumflow/co2/implicit/test_boxco2.cc
similarity index 100%
rename from test/implicit/co2/test_boxco2.cc
rename to test/porousmediumflow/co2/implicit/test_boxco2.cc
diff --git a/test/implicit/co2/test_boxco2.input b/test/porousmediumflow/co2/implicit/test_boxco2.input
similarity index 100%
rename from test/implicit/co2/test_boxco2.input
rename to test/porousmediumflow/co2/implicit/test_boxco2.input
diff --git a/test/implicit/co2/test_boxco2ni.cc b/test/porousmediumflow/co2/implicit/test_boxco2ni.cc
similarity index 100%
rename from test/implicit/co2/test_boxco2ni.cc
rename to test/porousmediumflow/co2/implicit/test_boxco2ni.cc
diff --git a/test/implicit/co2/test_boxco2ni.input b/test/porousmediumflow/co2/implicit/test_boxco2ni.input
similarity index 100%
rename from test/implicit/co2/test_boxco2ni.input
rename to test/porousmediumflow/co2/implicit/test_boxco2ni.input
diff --git a/test/implicit/co2/test_ccco2.cc b/test/porousmediumflow/co2/implicit/test_ccco2.cc
similarity index 100%
rename from test/implicit/co2/test_ccco2.cc
rename to test/porousmediumflow/co2/implicit/test_ccco2.cc
diff --git a/test/implicit/co2/test_ccco2.input b/test/porousmediumflow/co2/implicit/test_ccco2.input
similarity index 100%
rename from test/implicit/co2/test_ccco2.input
rename to test/porousmediumflow/co2/implicit/test_ccco2.input
diff --git a/test/implicit/co2/test_ccco2ni.cc b/test/porousmediumflow/co2/implicit/test_ccco2ni.cc
similarity index 100%
rename from test/implicit/co2/test_ccco2ni.cc
rename to test/porousmediumflow/co2/implicit/test_ccco2ni.cc
diff --git a/test/implicit/co2/test_ccco2ni.input b/test/porousmediumflow/co2/implicit/test_ccco2ni.input
similarity index 100%
rename from test/implicit/co2/test_ccco2ni.input
rename to test/porousmediumflow/co2/implicit/test_ccco2ni.input
diff --git a/test/implicit/co2/test_restartco2.input b/test/porousmediumflow/co2/implicit/test_restartco2.input
similarity index 100%
rename from test/implicit/co2/test_restartco2.input
rename to test/porousmediumflow/co2/implicit/test_restartco2.input
diff --git a/test/porousmediumflow/mpnc/CMakeLists.txt b/test/porousmediumflow/mpnc/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/mpnc/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/mpnc/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/mpnc/CMakeLists.txt
rename to test/porousmediumflow/mpnc/implicit/CMakeLists.txt
diff --git a/test/implicit/mpnc/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
similarity index 100%
rename from test/implicit/mpnc/combustionproblem1c.hh
rename to test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
diff --git a/test/implicit/mpnc/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
similarity index 100%
rename from test/implicit/mpnc/combustionspatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
diff --git a/test/implicit/mpnc/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
similarity index 100%
rename from test/implicit/mpnc/evaporationatmosphereproblem.hh
rename to test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
diff --git a/test/implicit/mpnc/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
similarity index 100%
rename from test/implicit/mpnc/evaporationatmospherespatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
diff --git a/test/implicit/mpnc/forchheimer1pproblem.hh b/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
similarity index 100%
rename from test/implicit/mpnc/forchheimer1pproblem.hh
rename to test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
diff --git a/test/implicit/mpnc/forchheimer2pproblem.hh b/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
similarity index 100%
rename from test/implicit/mpnc/forchheimer2pproblem.hh
rename to test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
diff --git a/test/implicit/mpnc/forchheimerspatialparams.hh b/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
similarity index 100%
rename from test/implicit/mpnc/forchheimerspatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
diff --git a/test/implicit/mpnc/grids/combustionOutflowGridLinNX100LogNx100.dgf b/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX100LogNx100.dgf
similarity index 100%
rename from test/implicit/mpnc/grids/combustionOutflowGridLinNX100LogNx100.dgf
rename to test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX100LogNx100.dgf
diff --git a/test/implicit/mpnc/grids/combustionOutflowGridLinNX200LogNx200.dgf b/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX200LogNx200.dgf
similarity index 100%
rename from test/implicit/mpnc/grids/combustionOutflowGridLinNX200LogNx200.dgf
rename to test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX200LogNx200.dgf
diff --git a/test/implicit/mpnc/grids/combustionOutflowGridLinNX400LogNx400.dgf b/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX400LogNx400.dgf
similarity index 100%
rename from test/implicit/mpnc/grids/combustionOutflowGridLinNX400LogNx400.dgf
rename to test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX400LogNx400.dgf
diff --git a/test/implicit/mpnc/grids/combustionOutflowGridLinNX40LogNx40.dgf b/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX40LogNx40.dgf
similarity index 100%
rename from test/implicit/mpnc/grids/combustionOutflowGridLinNX40LogNx40.dgf
rename to test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX40LogNx40.dgf
diff --git a/test/implicit/mpnc/grids/forchheimer1d.dgf b/test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf
similarity index 100%
rename from test/implicit/mpnc/grids/forchheimer1d.dgf
rename to test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf
diff --git a/test/implicit/mpnc/grids/obstacle_24x16.dgf b/test/porousmediumflow/mpnc/implicit/grids/obstacle_24x16.dgf
similarity index 100%
rename from test/implicit/mpnc/grids/obstacle_24x16.dgf
rename to test/porousmediumflow/mpnc/implicit/grids/obstacle_24x16.dgf
diff --git a/test/implicit/mpnc/grids/obstacle_48x32.dgf b/test/porousmediumflow/mpnc/implicit/grids/obstacle_48x32.dgf
similarity index 100%
rename from test/implicit/mpnc/grids/obstacle_48x32.dgf
rename to test/porousmediumflow/mpnc/implicit/grids/obstacle_48x32.dgf
diff --git a/test/implicit/mpnc/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
similarity index 100%
rename from test/implicit/mpnc/obstacleproblem.hh
rename to test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
diff --git a/test/implicit/mpnc/obstaclespatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
similarity index 100%
rename from test/implicit/mpnc/obstaclespatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
diff --git a/test/implicit/mpnc/test_boxmpnc.cc b/test/porousmediumflow/mpnc/implicit/test_boxmpnc.cc
similarity index 100%
rename from test/implicit/mpnc/test_boxmpnc.cc
rename to test/porousmediumflow/mpnc/implicit/test_boxmpnc.cc
diff --git a/test/implicit/mpnc/test_boxmpnc.input b/test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
similarity index 100%
rename from test/implicit/mpnc/test_boxmpnc.input
rename to test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
diff --git a/test/implicit/mpnc/test_boxmpnckinetic.cc b/test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.cc
similarity index 100%
rename from test/implicit/mpnc/test_boxmpnckinetic.cc
rename to test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.cc
diff --git a/test/implicit/mpnc/test_boxmpnckinetic.input b/test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.input
similarity index 100%
rename from test/implicit/mpnc/test_boxmpnckinetic.input
rename to test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.input
diff --git a/test/implicit/mpnc/test_boxmpncthermalnonequil.cc b/test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.cc
similarity index 100%
rename from test/implicit/mpnc/test_boxmpncthermalnonequil.cc
rename to test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.cc
diff --git a/test/implicit/mpnc/test_boxmpncthermalnonequil.input b/test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.input
similarity index 100%
rename from test/implicit/mpnc/test_boxmpncthermalnonequil.input
rename to test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.input
diff --git a/test/implicit/mpnc/test_ccmpnc.cc b/test/porousmediumflow/mpnc/implicit/test_ccmpnc.cc
similarity index 100%
rename from test/implicit/mpnc/test_ccmpnc.cc
rename to test/porousmediumflow/mpnc/implicit/test_ccmpnc.cc
diff --git a/test/implicit/mpnc/test_ccmpnc.input b/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
similarity index 100%
rename from test/implicit/mpnc/test_ccmpnc.input
rename to test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
diff --git a/test/implicit/mpnc/test_forchheimer1p.cc b/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.cc
similarity index 100%
rename from test/implicit/mpnc/test_forchheimer1p.cc
rename to test/porousmediumflow/mpnc/implicit/test_forchheimer1p.cc
diff --git a/test/implicit/mpnc/test_forchheimer1p.input b/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
similarity index 100%
rename from test/implicit/mpnc/test_forchheimer1p.input
rename to test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
diff --git a/test/implicit/mpnc/test_forchheimer2p.cc b/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.cc
similarity index 100%
rename from test/implicit/mpnc/test_forchheimer2p.cc
rename to test/porousmediumflow/mpnc/implicit/test_forchheimer2p.cc
diff --git a/test/implicit/mpnc/test_forchheimer2p.input b/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
similarity index 100%
rename from test/implicit/mpnc/test_forchheimer2p.input
rename to test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
diff --git a/test/porousmediumflow/richards/CMakeLists.txt b/test/porousmediumflow/richards/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba8341c614f1a2c797c95f5402f602025f1087b1
--- /dev/null
+++ b/test/porousmediumflow/richards/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory("implicit")
diff --git a/test/implicit/richards/CMakeLists.txt b/test/porousmediumflow/richards/implicit/CMakeLists.txt
similarity index 100%
rename from test/implicit/richards/CMakeLists.txt
rename to test/porousmediumflow/richards/implicit/CMakeLists.txt
diff --git a/test/implicit/richards/RichardsAnalytical.m b/test/porousmediumflow/richards/implicit/RichardsAnalytical.m
similarity index 100%
rename from test/implicit/richards/RichardsAnalytical.m
rename to test/porousmediumflow/richards/implicit/RichardsAnalytical.m
diff --git a/test/implicit/richards/grids/richardsanalytical-1x64.dgf b/test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf
similarity index 100%
rename from test/implicit/richards/grids/richardsanalytical-1x64.dgf
rename to test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf
diff --git a/test/implicit/richards/grids/richardslens-24x16.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf
similarity index 100%
rename from test/implicit/richards/grids/richardslens-24x16.dgf
rename to test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf
diff --git a/test/implicit/richards/grids/richardslens-48x32.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf
similarity index 100%
rename from test/implicit/richards/grids/richardslens-48x32.dgf
rename to test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf
diff --git a/test/implicit/richards/grids/richardslens-96x64.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf
similarity index 100%
rename from test/implicit/richards/grids/richardslens-96x64.dgf
rename to test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf
diff --git a/test/implicit/richards/grids/test_richardsniconduction.dgf b/test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf
similarity index 100%
rename from test/implicit/richards/grids/test_richardsniconduction.dgf
rename to test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf
diff --git a/test/implicit/richards/grids/test_richardsniconvection.dgf b/test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf
similarity index 100%
rename from test/implicit/richards/grids/test_richardsniconvection.dgf
rename to test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf
diff --git a/test/implicit/richards/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
similarity index 100%
rename from test/implicit/richards/richardsanalyticalproblem.hh
rename to test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
diff --git a/test/implicit/richards/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
similarity index 100%
rename from test/implicit/richards/richardsanalyticalspatialparams.hh
rename to test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
diff --git a/test/implicit/richards/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
similarity index 100%
rename from test/implicit/richards/richardslensproblem.hh
rename to test/porousmediumflow/richards/implicit/richardslensproblem.hh
diff --git a/test/implicit/richards/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
similarity index 100%
rename from test/implicit/richards/richardslensspatialparams.hh
rename to test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
diff --git a/test/implicit/richards/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
similarity index 100%
rename from test/implicit/richards/richardsniconductionproblem.hh
rename to test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
diff --git a/test/implicit/richards/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
similarity index 100%
rename from test/implicit/richards/richardsniconvectionproblem.hh
rename to test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
diff --git a/test/implicit/richards/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
similarity index 100%
rename from test/implicit/richards/richardsnispatialparams.hh
rename to test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
diff --git a/test/implicit/richards/test_boxrichards.cc b/test/porousmediumflow/richards/implicit/test_boxrichards.cc
similarity index 100%
rename from test/implicit/richards/test_boxrichards.cc
rename to test/porousmediumflow/richards/implicit/test_boxrichards.cc
diff --git a/test/implicit/richards/test_boxrichards.input b/test/porousmediumflow/richards/implicit/test_boxrichards.input
similarity index 100%
rename from test/implicit/richards/test_boxrichards.input
rename to test/porousmediumflow/richards/implicit/test_boxrichards.input
diff --git a/test/implicit/richards/test_boxrichardsniconduction.cc b/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.cc
similarity index 100%
rename from test/implicit/richards/test_boxrichardsniconduction.cc
rename to test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.cc
diff --git a/test/implicit/richards/test_boxrichardsniconduction.input b/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input
similarity index 100%
rename from test/implicit/richards/test_boxrichardsniconduction.input
rename to test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input
diff --git a/test/implicit/richards/test_boxrichardsniconvection.cc b/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.cc
similarity index 100%
rename from test/implicit/richards/test_boxrichardsniconvection.cc
rename to test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.cc
diff --git a/test/implicit/richards/test_boxrichardsniconvection.input b/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input
similarity index 100%
rename from test/implicit/richards/test_boxrichardsniconvection.input
rename to test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input
diff --git a/test/implicit/richards/test_ccrichards.cc b/test/porousmediumflow/richards/implicit/test_ccrichards.cc
similarity index 100%
rename from test/implicit/richards/test_ccrichards.cc
rename to test/porousmediumflow/richards/implicit/test_ccrichards.cc
diff --git a/test/implicit/richards/test_ccrichards.input b/test/porousmediumflow/richards/implicit/test_ccrichards.input
similarity index 100%
rename from test/implicit/richards/test_ccrichards.input
rename to test/porousmediumflow/richards/implicit/test_ccrichards.input
diff --git a/test/implicit/richards/test_ccrichardsanalytical.cc b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
similarity index 100%
rename from test/implicit/richards/test_ccrichardsanalytical.cc
rename to test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
diff --git a/test/implicit/richards/test_ccrichardsanalytical.input b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input
similarity index 100%
rename from test/implicit/richards/test_ccrichardsanalytical.input
rename to test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input
diff --git a/test/implicit/richards/test_ccrichardsniconduction.cc b/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.cc
similarity index 100%
rename from test/implicit/richards/test_ccrichardsniconduction.cc
rename to test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.cc
diff --git a/test/implicit/richards/test_ccrichardsniconduction.input b/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input
similarity index 100%
rename from test/implicit/richards/test_ccrichardsniconduction.input
rename to test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input
diff --git a/test/implicit/richards/test_ccrichardsniconvection.cc b/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.cc
similarity index 100%
rename from test/implicit/richards/test_ccrichardsniconvection.cc
rename to test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.cc
diff --git a/test/implicit/richards/test_ccrichardsniconvection.input b/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input
similarity index 100%
rename from test/implicit/richards/test_ccrichardsniconvection.input
rename to test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input