diff --git a/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2ctestproblem.hh
similarity index 88%
rename from test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
rename to test/porousmediumflow/1p2c/implicit/1p2ctestproblem.hh
index cc759e43e4e22359a431c82754c7f5acf263766b..be08f4d711a5cf0f6af26da95468f10fc058cba6 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2ctestproblem.hh
@@ -21,16 +21,17 @@
  * \brief Definition of a problem, for the 1p2c problem:
  * Component transport of nitrogen dissolved in the water phase.
  */
-#ifndef DUMUX_1P2C_OUTFLOW_PROBLEM_HH
-#define DUMUX_1P2C_OUTFLOW_PROBLEM_HH
+#ifndef DUMUX_1P2C_TEST_PROBLEM_HH
+#define DUMUX_1P2C_TEST_PROBLEM_HH
 
 #include <dumux/implicit/box/properties.hh>
 #include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/implicit/cellcentered/mpfa/properties.hh>
 #include <dumux/porousmediumflow/1p2c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include <dumux/material/fluidsystems/h2on2.hh>
-#include "1p2coutflowspatialparams.hh"
+#include "1p2ctestspatialparams.hh"
 
 #define NONISOTHERMAL 0
 
@@ -38,7 +39,7 @@ namespace Dumux
 {
 
 template <class TypeTag>
-class OnePTwoCOutflowProblem;
+class OnePTwoCTestProblem;
 
 namespace Properties
 {
@@ -47,39 +48,40 @@ NEW_TYPE_TAG(OnePTwoCOutflowProblem, INHERITS_FROM(OnePTwoCNI));
 NEW_TYPE_TAG(OnePTwoCOutflowBoxProblem, INHERITS_FROM(BoxModel, OnePTwoCOutflowProblem));
 NEW_TYPE_TAG(OnePTwoCOutflowCCProblem, INHERITS_FROM(CCTpfaModel, OnePTwoCOutflowProblem));
 #else
-NEW_TYPE_TAG(OnePTwoCOutflowProblem, INHERITS_FROM(OnePTwoC));
-NEW_TYPE_TAG(OnePTwoCOutflowBoxProblem, INHERITS_FROM(BoxModel, OnePTwoCOutflowProblem));
-NEW_TYPE_TAG(OnePTwoCOutflowCCProblem, INHERITS_FROM(CCTpfaModel, OnePTwoCOutflowProblem));
+NEW_TYPE_TAG(OnePTwoCTestProblem, INHERITS_FROM(OnePTwoC));
+NEW_TYPE_TAG(OnePTwoCTestBoxProblem, INHERITS_FROM(BoxModel, OnePTwoCTestProblem));
+NEW_TYPE_TAG(OnePTwoCTestCCProblem, INHERITS_FROM(CCTpfaModel, OnePTwoCTestProblem));
+NEW_TYPE_TAG(OnePTwoCTestCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePTwoCTestProblem));
 #endif
 
 // Set the grid type
 #if HAVE_UG
-SET_TYPE_PROP(OnePTwoCOutflowProblem, Grid, Dune::UGGrid<2>);
+SET_TYPE_PROP(OnePTwoCTestProblem, Grid, Dune::UGGrid<2>);
 #else
-SET_TYPE_PROP(OnePTwoCOutflowProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(OnePTwoCTestProblem, Grid, Dune::YaspGrid<2>);
 #endif
 
 // Set the problem property
-SET_TYPE_PROP(OnePTwoCOutflowProblem, Problem, OnePTwoCOutflowProblem<TypeTag>);
+SET_TYPE_PROP(OnePTwoCTestProblem, Problem, OnePTwoCTestProblem<TypeTag>);
 
 // Set fluid configuration
-SET_TYPE_PROP(OnePTwoCOutflowProblem,
+SET_TYPE_PROP(OnePTwoCTestProblem,
               FluidSystem,
               FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
 
 // Set the spatial parameters
-SET_TYPE_PROP(OnePTwoCOutflowProblem,
+SET_TYPE_PROP(OnePTwoCTestProblem,
               SpatialParams,
-              OnePTwoCOutflowSpatialParams<TypeTag>);
+              OnePTwoCTestSpatialParams<TypeTag>);
 
 // Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(OnePTwoCOutflowProblem, UseMoles, true);
+SET_BOOL_PROP(OnePTwoCTestProblem, UseMoles, true);
 
 // Enable velocity output
-SET_BOOL_PROP(OnePTwoCOutflowProblem, VtkAddVelocity, true);
+SET_BOOL_PROP(OnePTwoCTestProblem, VtkAddVelocity, true);
 
 // Disable gravity
-SET_BOOL_PROP(OnePTwoCOutflowProblem, ProblemEnableGravity, false);
+SET_BOOL_PROP(OnePTwoCTestProblem, ProblemEnableGravity, false);
 }
 
 
@@ -100,7 +102,8 @@ SET_BOOL_PROP(OnePTwoCOutflowProblem, ProblemEnableGravity, false);
  * The water phase flows from the left side to the right due to the applied pressure
  * gradient of 1e5 Pa/m. The nitrogen is transported with the water flow
  * and leaves the domain at the right boundary
- * where an outflow boundary condition is applied.
+ * where again Dirichlet boundary conditions are applied. Here, the nitrogen mole
+ * fraction is set to 0.0 mol/mol.
  *
  * The model is able to use either mole or mass fractions. The property useMoles can be set to either true or false in the
  * problem file. Make sure that the according units are used in the problem setup. The default setting for useMoles is true.
@@ -112,7 +115,7 @@ SET_BOOL_PROP(OnePTwoCOutflowProblem, ProblemEnableGravity, false);
  * <tt>./test_cc1p2c -parameterFile ./test_cc1p2c.input</tt>
  */
 template <class TypeTag>
-class OnePTwoCOutflowProblem : public ImplicitPorousMediaProblem<TypeTag>
+class OnePTwoCTestProblem : public ImplicitPorousMediaProblem<TypeTag>
 {
     using ParentType = ImplicitPorousMediaProblem<TypeTag>;
 
@@ -149,7 +152,7 @@ class OnePTwoCOutflowProblem : public ImplicitPorousMediaProblem<TypeTag>
     typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
 
 public:
-    OnePTwoCOutflowProblem(TimeManager &timeManager, const GridView &gridView)
+    OnePTwoCTestProblem(TimeManager &timeManager, const GridView &gridView)
         : ParentType(timeManager, gridView)
         , eps_(1e-6)
     {
diff --git a/test/porousmediumflow/1p2c/implicit/1p2coutflowspatialparams.hh b/test/porousmediumflow/1p2c/implicit/1p2ctestspatialparams.hh
similarity index 93%
rename from test/porousmediumflow/1p2c/implicit/1p2coutflowspatialparams.hh
rename to test/porousmediumflow/1p2c/implicit/1p2ctestspatialparams.hh
index 4b9f3453f2e1d06656fea9573d7b6384e031f83d..d845671f0e17e3e9bb9cec383799cca78d200ce5 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2coutflowspatialparams.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2ctestspatialparams.hh
@@ -22,8 +22,8 @@
  * \brief Definition of the spatial parameters for the 1p2c
  *        outlfow problem.
  */
-#ifndef DUMUX_1P2C_OUTFLOW_SPATIAL_PARAMS_HH
-#define DUMUX_1P2C_OUTFLOW_SPATIAL_PARAMS_HH
+#ifndef DUMUX_1P2C_TEST_SPATIAL_PARAMS_HH
+#define DUMUX_1P2C_TEST_SPATIAL_PARAMS_HH
 
 #include <dumux/material/spatialparams/implicit1p.hh>
 
@@ -38,7 +38,7 @@ namespace Dumux
  *        outflow problem.
  */
 template<class TypeTag>
-class OnePTwoCOutflowSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePTwoCTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
 {
     using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
@@ -51,7 +51,7 @@ class OnePTwoCOutflowSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
     using GlobalPosition = typename Dune::FieldVector<Scalar, dimWorld>;
 
 public:
-    OnePTwoCOutflowSpatialParams(const Problem& problem, const GridView &gridView)
+    OnePTwoCTestSpatialParams(const Problem& problem, const GridView &gridView)
         : ParentType(problem, gridView)
     {
         permeability_ = 1e-10;
@@ -61,7 +61,7 @@ public:
         lambdaSolid_ = 2.8;
     }
 
-    ~OnePTwoCOutflowSpatialParams()
+    ~OnePTwoCTestSpatialParams()
     {}
 
     /*!
diff --git a/test/porousmediumflow/1p2c/implicit/CMakeLists.txt b/test/porousmediumflow/1p2c/implicit/CMakeLists.txt
index dad14d4f7ff77e5f02dae996cb0b397ffd0bbb81..4532b5193f90f0e8ae6396aeb9966c18dc6d07f5 100644
--- a/test/porousmediumflow/1p2c/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1p2c/implicit/CMakeLists.txt
@@ -12,8 +12,8 @@ add_dumux_test(test_box1p2c test_box1p2c test_box1p2c.cc
 add_dumux_test(test_cc1p2c test_cc1p2c test_cc1p2c.cc
                python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                  --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/test/references/outflowcc-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/outflowcc-00009.vtu
+                 --files ${CMAKE_SOURCE_DIR}/test/references/1p2ctestcc-reference.vtu
+                         ${CMAKE_CURRENT_BINARY_DIR}/1p2ctestcc-00009.vtu
                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p2c"
                  --zeroThreshold {"velocity":5e-16})
 
diff --git a/test/porousmediumflow/1p2c/implicit/test_cc1p2c.cc b/test/porousmediumflow/1p2c/implicit/test_cc1p2c.cc
index 578365c4830cff10fc1edf12aada59afd54e5d04..b3e52acc55ce1742de93ba54b0931b0f24f737e6 100644
--- a/test/porousmediumflow/1p2c/implicit/test_cc1p2c.cc
+++ b/test/porousmediumflow/1p2c/implicit/test_cc1p2c.cc
@@ -22,7 +22,7 @@
  * \brief test for the 1p2c CC model
  */
 #include <config.h>
-#include "1p2coutflowproblem.hh"
+#include "1p2ctestproblem.hh"
 #include <dumux/common/start.hh>
 
 /*!
@@ -52,6 +52,6 @@ void usage(const char *progName, const std::string &errorMsg)
 
 int main(int argc, char** argv)
 {
-    typedef TTAG(OnePTwoCOutflowCCProblem) ProblemTypeTag;
+    typedef TTAG(OnePTwoCTestCCProblem) ProblemTypeTag;
     return Dumux::start<ProblemTypeTag>(argc, argv, usage);
 }
diff --git a/test/porousmediumflow/1p2c/implicit/test_cc1p2c.input b/test/porousmediumflow/1p2c/implicit/test_cc1p2c.input
index cd2cbb7cb0aff281e9af853048a9b6a8150294a6..82d23eb3b74936c944ebd4c75a548772e51a0adc 100644
--- a/test/porousmediumflow/1p2c/implicit/test_cc1p2c.input
+++ b/test/porousmediumflow/1p2c/implicit/test_cc1p2c.input
@@ -8,7 +8,7 @@ UpperRight = 1 1
 Cells = 20 2
 
 [Problem]
-Name = outflowcc # name passed to the output routines
+Name = 1p2ctestcc # name passed to the output routines
 EnableGravity = 0 # disable gravity
 
 [Vtk]
diff --git a/test/references/outflowcc-reference.vtu b/test/references/1p2ctestcc-reference.vtu
similarity index 100%
rename from test/references/outflowcc-reference.vtu
rename to test/references/1p2ctestcc-reference.vtu