diff --git a/test/porousmediumflow/3p3c/CMakeLists.txt b/test/porousmediumflow/3p3c/CMakeLists.txt
index 52318c8c0846044f9f8be3725616d8b529e77697..27998587c92ff502c87edeaa5fd691d602450c80 100644
--- a/test/porousmediumflow/3p3c/CMakeLists.txt
+++ b/test/porousmediumflow/3p3c/CMakeLists.txt
@@ -1 +1,3 @@
-add_subdirectory(implicit)
+add_subdirectory(columnxylol)
+add_subdirectory(infiltration)
+add_subdirectory(kuevette)
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt b/test/porousmediumflow/3p3c/columnxylol/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
rename to test/porousmediumflow/3p3c/columnxylol/CMakeLists.txt
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc b/test/porousmediumflow/3p3c/columnxylol/main.cc
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/columnxylol/main.cc
rename to test/porousmediumflow/3p3c/columnxylol/main.cc
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/params.input b/test/porousmediumflow/3p3c/columnxylol/params.input
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/columnxylol/params.input
rename to test/porousmediumflow/3p3c/columnxylol/params.input
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh b/test/porousmediumflow/3p3c/columnxylol/problem.hh
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh
rename to test/porousmediumflow/3p3c/columnxylol/problem.hh
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh b/test/porousmediumflow/3p3c/columnxylol/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh
rename to test/porousmediumflow/3p3c/columnxylol/spatialparams.hh
diff --git a/test/porousmediumflow/3p3c/implicit/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/CMakeLists.txt
deleted file mode 100644
index 27998587c92ff502c87edeaa5fd691d602450c80..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p3c/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory(columnxylol)
-add_subdirectory(infiltration)
-add_subdirectory(kuevette)
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt b/test/porousmediumflow/3p3c/infiltration/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt
rename to test/porousmediumflow/3p3c/infiltration/CMakeLists.txt
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/main.cc b/test/porousmediumflow/3p3c/infiltration/main.cc
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/infiltration/main.cc
rename to test/porousmediumflow/3p3c/infiltration/main.cc
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/params.input b/test/porousmediumflow/3p3c/infiltration/params.input
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/infiltration/params.input
rename to test/porousmediumflow/3p3c/infiltration/params.input
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh b/test/porousmediumflow/3p3c/infiltration/problem.hh
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/infiltration/problem.hh
rename to test/porousmediumflow/3p3c/infiltration/problem.hh
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh b/test/porousmediumflow/3p3c/infiltration/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh
rename to test/porousmediumflow/3p3c/infiltration/spatialparams.hh
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt b/test/porousmediumflow/3p3c/kuevette/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt
rename to test/porousmediumflow/3p3c/kuevette/CMakeLists.txt
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/main.cc b/test/porousmediumflow/3p3c/kuevette/main.cc
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/kuevette/main.cc
rename to test/porousmediumflow/3p3c/kuevette/main.cc
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/params.input b/test/porousmediumflow/3p3c/kuevette/params.input
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/kuevette/params.input
rename to test/porousmediumflow/3p3c/kuevette/params.input
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh b/test/porousmediumflow/3p3c/kuevette/problem.hh
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/kuevette/problem.hh
rename to test/porousmediumflow/3p3c/kuevette/problem.hh
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh b/test/porousmediumflow/3p3c/kuevette/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh
rename to test/porousmediumflow/3p3c/kuevette/spatialparams.hh