diff --git a/test/porousmediumflow/2p2c/CMakeLists.txt b/test/porousmediumflow/2p2c/CMakeLists.txt
index 52318c8c0846044f9f8be3725616d8b529e77697..c3f793bdafea9470988513276614b97945bdbc4f 100644
--- a/test/porousmediumflow/2p2c/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/CMakeLists.txt
@@ -1 +1,4 @@
-add_subdirectory(implicit)
+add_subdirectory(injection)
+add_subdirectory(mpnccomparison)
+add_subdirectory(waterair)
+add_subdirectory(chemicalnonequilibrium)
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/CMakeLists.txt b/test/porousmediumflow/2p2c/chemicalnonequilibrium/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/CMakeLists.txt
rename to test/porousmediumflow/2p2c/chemicalnonequilibrium/CMakeLists.txt
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc b/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc
rename to test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input b/test/porousmediumflow/2p2c/chemicalnonequilibrium/params.input
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input
rename to test/porousmediumflow/2p2c/chemicalnonequilibrium/params.input
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh b/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh
rename to test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh b/test/porousmediumflow/2p2c/chemicalnonequilibrium/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
rename to test/porousmediumflow/2p2c/chemicalnonequilibrium/spatialparams.hh
diff --git a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt
deleted file mode 100644
index c3f793bdafea9470988513276614b97945bdbc4f..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_subdirectory(injection)
-add_subdirectory(mpnccomparison)
-add_subdirectory(waterair)
-add_subdirectory(chemicalnonequilibrium)
diff --git a/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt b/test/porousmediumflow/2p2c/injection/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt
rename to test/porousmediumflow/2p2c/injection/CMakeLists.txt
diff --git a/test/porousmediumflow/2p2c/implicit/injection/main.cc b/test/porousmediumflow/2p2c/injection/main.cc
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/injection/main.cc
rename to test/porousmediumflow/2p2c/injection/main.cc
diff --git a/test/porousmediumflow/2p2c/implicit/injection/params.input b/test/porousmediumflow/2p2c/injection/params.input
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/injection/params.input
rename to test/porousmediumflow/2p2c/injection/params.input
diff --git a/test/porousmediumflow/2p2c/implicit/injection/problem.hh b/test/porousmediumflow/2p2c/injection/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/injection/problem.hh
rename to test/porousmediumflow/2p2c/injection/problem.hh
diff --git a/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh b/test/porousmediumflow/2p2c/injection/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh
rename to test/porousmediumflow/2p2c/injection/spatialparams.hh
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt b/test/porousmediumflow/2p2c/mpnccomparison/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt
rename to test/porousmediumflow/2p2c/mpnccomparison/CMakeLists.txt
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh b/test/porousmediumflow/2p2c/mpnccomparison/iofields.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh
rename to test/porousmediumflow/2p2c/mpnccomparison/iofields.hh
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc b/test/porousmediumflow/2p2c/mpnccomparison/main.cc
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc
rename to test/porousmediumflow/2p2c/mpnccomparison/main.cc
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/params.input b/test/porousmediumflow/2p2c/mpnccomparison/params.input
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/mpnccomparison/params.input
rename to test/porousmediumflow/2p2c/mpnccomparison/params.input
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh b/test/porousmediumflow/2p2c/mpnccomparison/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh
rename to test/porousmediumflow/2p2c/mpnccomparison/problem.hh
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh b/test/porousmediumflow/2p2c/mpnccomparison/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh
rename to test/porousmediumflow/2p2c/mpnccomparison/spatialparams.hh
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt b/test/porousmediumflow/2p2c/waterair/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt
rename to test/porousmediumflow/2p2c/waterair/CMakeLists.txt
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/main.cc b/test/porousmediumflow/2p2c/waterair/main.cc
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/waterair/main.cc
rename to test/porousmediumflow/2p2c/waterair/main.cc
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/params.input b/test/porousmediumflow/2p2c/waterair/params.input
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/waterair/params.input
rename to test/porousmediumflow/2p2c/waterair/params.input
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh b/test/porousmediumflow/2p2c/waterair/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/waterair/problem.hh
rename to test/porousmediumflow/2p2c/waterair/problem.hh
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh b/test/porousmediumflow/2p2c/waterair/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh
rename to test/porousmediumflow/2p2c/waterair/spatialparams.hh