diff --git a/test/implicit/2p/Makefile.am b/test/implicit/2p/Makefile.am
index 890f94bff76fcfb03658b6cf730111768c650b9d..bb63e52dcf69a53e0c961616e415e4bd79b8d24e 100644
--- a/test/implicit/2p/Makefile.am
+++ b/test/implicit/2p/Makefile.am
@@ -1,9 +1,9 @@
-check_PROGRAMS = test_2p test_cc2p
+check_PROGRAMS = test_box2p test_cc2p
 
 noinst_HEADERS = *.hh
 EXTRA_DIST=*reference.vtu *.input grids/*.dgf CMakeLists.txt
 
-test_2p_SOURCES = test_2p.cc
+test_box2p_SOURCES = test_box2p.cc
 test_cc2p_SOURCES = test_cc2p.cc
 
 include $(top_srcdir)/am/global-rules
diff --git a/test/implicit/2p/lensspatialparams.hh b/test/implicit/2p/lensspatialparams.hh
index 348ed8397628f6751fed79d69f110bbfc679cc3f..50d24f97836a13c45c894b86d82232b1781996f5 100644
--- a/test/implicit/2p/lensspatialparams.hh
+++ b/test/implicit/2p/lensspatialparams.hh
@@ -149,11 +149,7 @@ public:
         if (!isBox_ && scvIdx > 0)
             return intrinsicPermeability(*(fvElemGeom.neighbors[scvIdx]), fvElemGeom, 0);
         
-        GlobalPosition globalPos;
-        if (isBox_)
-            globalPos = fvElemGeom.subContVol[scvIdx].global;
-        else 
-            globalPos = element.geometry().center();
+        const GlobalPosition& globalPos = fvElemGeom.subContVol[scvIdx].global;
         
         if (isInLens_(globalPos))
             return lensK_;
@@ -188,11 +184,7 @@ public:
         if (!isBox_ && scvIdx > 0)
             return materialLawParams(*(fvElemGeom.neighbors[scvIdx]), fvElemGeom, 0);
         
-        GlobalPosition globalPos;
-        if (isBox_)
-            globalPos = fvElemGeom.subContVol[scvIdx].global;
-        else 
-            globalPos = element.geometry().center();
+        const GlobalPosition& globalPos = fvElemGeom.subContVol[scvIdx].global;
         
         if (isInLens_(globalPos))
             return lensMaterialParams_;
diff --git a/test/implicit/2p/test_2p.cc b/test/implicit/2p/test_box2p.cc
similarity index 100%
rename from test/implicit/2p/test_2p.cc
rename to test/implicit/2p/test_box2p.cc
diff --git a/test/implicit/2p/test_2p.input b/test/implicit/2p/test_box2p.input
similarity index 100%
rename from test/implicit/2p/test_2p.input
rename to test/implicit/2p/test_box2p.input