diff --git a/dumux/implicit/box/fvelementgeometry.hh b/dumux/implicit/box/fvelementgeometry.hh
index f22f057ad970250995da319bc3fde4fe85e99922..ce9b48ce4e0768c33bd73b928e75082a65b1d069 100644
--- a/dumux/implicit/box/fvelementgeometry.hh
+++ b/dumux/implicit/box/fvelementgeometry.hh
@@ -85,9 +85,9 @@ public:
                                    GlobalPosition *edgeCoord,
                                    GlobalPosition *faceCoord)
     {
-        std::vector<GlobalPosition> corners = {edgeCoord[0], fvGeometry.elementGlobal};
+        std::vector<GlobalPosition> corners = {fvGeometry.subContVol[0].global, fvGeometry.elementGlobal};
         fvGeometry.subContVolGeometries.push_back(SCVGeometry(Dune::GeometryType(Dune::GeometryType::cube, 1), corners));
-        corners = {fvGeometry.elementGlobal, edgeCoord[1]};
+        corners = {fvGeometry.elementGlobal, fvGeometry.subContVol[1].global};
         fvGeometry.subContVolGeometries.push_back(SCVGeometry(Dune::GeometryType(Dune::GeometryType::cube, 1), corners));
     }
 };
diff --git a/dumux/porousmediumflow/2pminc/implicit/model.hh b/dumux/porousmediumflow/2pminc/implicit/model.hh
index da078024e87bdda009c4ac7c10e42a9f0d2e8903..3d6512f77420bb986a49304571bde33a2131be47 100644
--- a/dumux/porousmediumflow/2pminc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/model.hh
@@ -282,11 +282,13 @@ public:
             }
 
             //VOLUME FRACTION
-            for (int nC= 0; nC<numContinua; nC++)
+            for (int nC= 0; nC<numContinua-1; nC++)
             {
                 volFraction_[nC] = volContinuum[nC] - volContinuum[nC+1];
                 volFraction_[nC] /= volContinuum[0];
             }
+            volFraction_[numContinua-1] = volContinuum[numContinua-1]/volContinuum[0];
+
             }
             break;
         // EquidistantNestedVolumeElements
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
index 70911d47447e6997c16ba5865e961ff9b2bcf06c..bb6ea7b66cf7d83364f6eb92bc7e08013e4b5d99 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
@@ -54,7 +54,7 @@
 
 #include <dumux/material/fluidsystems/h2on2kinetic.hh>
 #include <dumux/io/gnuplotinterface.hh>
-#include <dumux/io/plotoverline2d.hh>
+#include "plotoverline2d.hh"
 
 #include <dumux/material/fluidstates/nonequilibrium.hh>
 //#include <dumux/material/fluidstates/nonequilibriumenergy.hh>
diff --git a/dumux/io/plotoverline2d.hh b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
similarity index 97%
rename from dumux/io/plotoverline2d.hh
rename to test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
index c5a8102f509a184981f92948c7155ac66ec68387..cd3ab7cd21f302f376607ee3aa8b033996e195c6 100644
--- a/dumux/io/plotoverline2d.hh
+++ b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
@@ -167,13 +167,13 @@ public:
                 if (isBetween(globalPosCurrent, pointOne, pointTwo))
                 {
                     const Scalar time         = problem.timeManager().time();
-                    const Scalar saturationW  = elemVolVars[scvIdx].fluidState().saturation(wPhaseIdx);
-                    const Scalar Tw           = elemVolVars[scvIdx].fluidState().temperature(wPhaseIdx);
-                    const Scalar Tn           = elemVolVars[scvIdx].fluidState().temperature(nPhaseIdx);
-                    const Scalar Ts           = elemVolVars[scvIdx].fluidState().temperature(sPhaseIdx);
-                    const Scalar xH2On        = elemVolVars[scvIdx].fluidState().moleFraction(nPhaseIdx, wCompIdx);
+                    const Scalar saturationW  = elemVolVars[scvIdx].saturation(wPhaseIdx);
+                    const Scalar Tw           = elemVolVars[scvIdx].temperature(wPhaseIdx);
+                    const Scalar Tn           = elemVolVars[scvIdx].temperature(nPhaseIdx);
+                    const Scalar Ts           = elemVolVars[scvIdx].temperature(sPhaseIdx);
+                    const Scalar xH2On        = elemVolVars[scvIdx].moleFraction(nPhaseIdx, wCompIdx);
                     const Scalar xH2OnEquil   = elemVolVars[scvIdx].xEquil(nPhaseIdx, wCompIdx);
-                    const Scalar xN2w         = elemVolVars[scvIdx].fluidState().moleFraction(wPhaseIdx, nCompIdx);
+                    const Scalar xN2w         = elemVolVars[scvIdx].moleFraction(wPhaseIdx, nCompIdx);
                     const Scalar xN2wEquil    = elemVolVars[scvIdx].xEquil(wPhaseIdx, nCompIdx);
 
                     // actual output into the text file