diff --git a/test/implicit/3p3c/infiltrationspatialparameters.hh b/test/implicit/3p3c/infiltrationspatialparameters.hh
index 26e707a2d4e64afff44c400325fc87dd187e6954..8d9cf61bc40dab7833257d2a3b8a5ab317a59964 100644
--- a/test/implicit/3p3c/infiltrationspatialparameters.hh
+++ b/test/implicit/3p3c/infiltrationspatialparameters.hh
@@ -249,8 +249,8 @@ public:
         static const Scalar lSn1 = 0.65;
 
         // arithmetic mean of the liquid saturation and the porosity
-        const int i = fvGeometry.subContVolFace[scvfIdx].i;
-        const int j = fvGeometry.subContVolFace[scvfIdx].j;
+        const int i = fluxDat.face().i;
+        const int j = fluxDat.face().j;
         Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
                                    elemVolVars[j].saturation(wPhaseIdx)) / 2);
         Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
diff --git a/test/implicit/3p3cni/columnxylolspatialparams.hh b/test/implicit/3p3cni/columnxylolspatialparams.hh
index 326f142f46c71a745f86c51dcb13f482a404599d..ffa6439576d4bfa29bd6c3b8b21542336923a4b9 100644
--- a/test/implicit/3p3cni/columnxylolspatialparams.hh
+++ b/test/implicit/3p3cni/columnxylolspatialparams.hh
@@ -263,8 +263,8 @@ public:
         static const Scalar lSn1 = 0.65;
 
         // arithmetic mean of the liquid saturation and the porosity
-        const int i = fvGeometry.subContVolFace[faceIdx].i;
-        const int j = fvGeometry.subContVolFace[faceIdx].j;
+        const int i = fluxDat.face().i;
+        const int j = fluxDat.face().j;
         Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
                                    elemVolVars[j].saturation(wPhaseIdx)) / 2);
         Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
diff --git a/test/implicit/3p3cni/kuevettespatialparams.hh b/test/implicit/3p3cni/kuevettespatialparams.hh
index d3487b383c2559e49fb9df29b002fbdbad146af6..fe3166dbf9258010ae728fd751fa0ae967a47cb0 100644
--- a/test/implicit/3p3cni/kuevettespatialparams.hh
+++ b/test/implicit/3p3cni/kuevettespatialparams.hh
@@ -258,8 +258,8 @@ public:
         static const Scalar lSn1 = 0.65;
 
         // arithmetic mean of the liquid saturation and the porosity
-        const int i = fvGeometry.subContVolFace[faceIdx].i;
-        const int j = fvGeometry.subContVolFace[faceIdx].j;
+        const int i = fluxDat.face().i;
+        const int j = fluxDat.face().j;
         Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
                                    elemVolVars[j].saturation(wPhaseIdx)) / 2);
         Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
diff --git a/test/implicit/mpnc/obstaclespatialparams.hh b/test/implicit/mpnc/obstaclespatialparams.hh
index ed9bf3477135366b687b87525232c626a392044d..ab3be7bc9a403ff9fb9d533ec882b905a9113a2b 100644
--- a/test/implicit/mpnc/obstaclespatialparams.hh
+++ b/test/implicit/mpnc/obstaclespatialparams.hh
@@ -216,8 +216,8 @@ public:
 //        static const Scalar lGranite = 2.8; // [W / (m K ) ]
 //
 //        // arithmetic mean of the liquid saturation and the porosity
-//        const int i = fvElemGeom.subContVolFace[faceIdx].i;
-//        const int j = fvElemGeom.subContVolFace[faceIdx].j;
+//        const int i = fluxDat.face().i;
+//        const int j = fluxDat.face().j;
 //        Scalar Sl = std::max(0.0, (vDat[i].saturation(wPhaseIdx) +
 //                                     vDat[j].saturation(wPhaseIdx)) / 2);
 //        Scalar poro = (porosity(element, fvElemGeom, i) +