diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index b67d06fe2339e04db3654f62459fc6dde7f8ba61..59a80669e08f9b6fd5758fc91326e1a986d9ca6e 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -117,6 +117,7 @@ class CombustionProblemOneComponent: public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
     using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
     using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+    using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
     using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
     using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -216,12 +217,12 @@ public:
      * Positive values mean that mass is created, negative ones mean that it vanishes.
      */
     //! \copydoc Dumux::ImplicitProblem::source()
-    PrimaryVariables source(const Element &element,
+    NumEqVector source(const Element &element,
                             const FVElementGeometry& fvGeometry,
                             const ElementVolumeVariables& elemVolVars,
                             const SubControlVolume &scv) const
     {
-        PrimaryVariables priVars(0.0);
+        NumEqVector values(0.0);
 
         const auto& globalPos = scv.dofPosition();
 
@@ -233,10 +234,10 @@ public:
             if (onRightBoundaryPorousMedium_(globalPos))
             {
                 // Testing the location of a vertex, but function is called for each associated scv. Compensate for that
-                priVars[energyEqSolidIdx] = heatFluxFromRight_ / volume / numScv;
+                values[energyEqSolidIdx] = heatFluxFromRight_ / volume / numScv;
             }
          }
-        return priVars;
+        return values;
     }
 
     /*!
@@ -287,12 +288,12 @@ public:
      * For this method, the \a values parameter stores the mass flux
      * in normal direction of each phase. Negative values mean influx.
      */
-    PrimaryVariables neumann(const Element &element,
+    NumEqVector neumann(const Element &element,
                              const FVElementGeometry& fvGeometry,
                              const ElementVolumeVariables& elemVolVars,
                              const SubControlVolumeFace& scvf) const
     {
-        PrimaryVariables priVars(0.0);
+        NumEqVector values(0.0);
 
         const auto& globalPos = fvGeometry.scv(scvf.insideScvIdx()).dofPosition();
         const auto& scvIdx = scvf.insideScvIdx();
@@ -327,11 +328,11 @@ public:
 
         if (onLeftBoundary_(globalPos))
         {
-            priVars[conti00EqIdx + wCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, wCompIdx);;
-            priVars[conti00EqIdx + nCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, nCompIdx);;
-            priVars[energyEq0Idx] = - massFluxInjectedPhase * fluidState.enthalpy(wPhaseIdx);
+            values[conti00EqIdx + wCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, wCompIdx);;
+            values[conti00EqIdx + nCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, nCompIdx);;
+            values[energyEq0Idx] = - massFluxInjectedPhase * fluidState.enthalpy(wPhaseIdx);
         }
-        return priVars;
+        return values;
     }
 
     /*!
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
index 6205c76f098ebd45f3a0b3459a598955e07eaeae..25d711f61a709f05107405dd889fc5b26b98e5b1 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
@@ -105,6 +105,7 @@ class EvaporationAtmosphereProblem: public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
     using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
     using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+    using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
     using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
     using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -247,12 +248,12 @@ public:
      * The \a values store the mass flux of each phase normal to the boundary.
      * Negative values indicate an inflow.
      */
-    PrimaryVariables neumann(const Element &element,
+    NumEqVector neumann(const Element &element,
                              const FVElementGeometry& fvGeometry,
                              const ElementVolumeVariables& elemVolVars,
                              const SubControlVolumeFace& scvf) const
     {
-        PrimaryVariables priVars(0.0);
+        NumEqVector values(0.0);
         const auto& globalPos = fvGeometry.scv(scvf.insideScvIdx()).dofPosition();
         const Scalar massFluxInjectedPhase = massFluxInjectedPhase_ ;
 
@@ -293,15 +294,15 @@ public:
         // actually setting the fluxes
         if (onLeftBoundary_(globalPos) && this->spatialParams().inFF_(globalPos))
         {
-            priVars[conti00EqIdx + nPhaseIdx * numComponents + wCompIdx]
+            values[conti00EqIdx + nPhaseIdx * numComponents + wCompIdx]
              = -molarFlux * fluidState.moleFraction(nPhaseIdx, wCompIdx);
-            priVars[conti00EqIdx + nPhaseIdx * numComponents + nCompIdx]
+            values[conti00EqIdx + nPhaseIdx * numComponents + nCompIdx]
              = -molarFlux * fluidState.moleFraction(nPhaseIdx, nCompIdx);
             // energy equations are specified mass specifically
-            priVars[energyEq0Idx + nPhaseIdx] = - massFluxInjectedPhase
+            values[energyEq0Idx + nPhaseIdx] = - massFluxInjectedPhase
                                                     * fluidState.enthalpy(nPhaseIdx) ;
         }
-        return priVars;
+        return values;
     }
 
     /*!
@@ -333,13 +334,13 @@ public:
      *
      *      Positive values mean that mass is created, negative ones mean that it vanishes.
      */
-    PrimaryVariables source(const Element &element,
+    NumEqVector source(const Element &element,
                             const FVElementGeometry& fvGeometry,
                             const ElementVolumeVariables& elemVolVars,
                             const SubControlVolume &scv) const
     {
-        PrimaryVariables priVars(0.0);
-        return priVars;
+        NumEqVector values(0.0);
+        return values;
 
     }
 
diff --git a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
index 66a856afc9b4f9cb58bf4b90ba9c1f16ef0bb317..e7537ee9763e7bde0ebe4d1e961822ffb7e58d27 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
@@ -112,6 +112,7 @@ class ObstacleProblem
     using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
     using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
     using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+    using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
     using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
     using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
     using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
@@ -239,12 +240,12 @@ public:
      *
      * Negative values mean influx.
      */
-    PrimaryVariables neumann(const Element& element,
+    NumEqVector neumann(const Element& element,
                              const FVElementGeometry& fvGeometry,
                              const ElementVolumeVariables& elemVolVars,
                              const SubControlVolumeFace& scvf) const
     {
-        return PrimaryVariables(0.0);
+        return NumEqVector(0.0);
     }
 
     // \}
@@ -267,12 +268,12 @@ public:
      * Positive values mean that mass is created, negative ones mean that it vanishes.
      */
     //! \copydoc Dumux::ImplicitProblem::source()
-    PrimaryVariables source(const Element &element,
+    NumEqVector source(const Element &element,
                             const FVElementGeometry& fvGeometry,
                             const ElementVolumeVariables& elemVolVars,
                             const SubControlVolume &scv) const
     {
-       return PrimaryVariables(0.0);
+       return NumEqVector(0.0);
     }
 
     /*!