diff --git a/test/common/generalproblem/generallensspatialparams.hh b/test/common/generalproblem/generallensspatialparams.hh
index 06adf1a765cef783626937ec82aee862c7e6e722..0c4a60970d91d380e4d0dc676af361eae86d2f52 100644
--- a/test/common/generalproblem/generallensspatialparams.hh
+++ b/test/common/generalproblem/generallensspatialparams.hh
@@ -91,10 +91,8 @@ public:
     GeneralLensSpatialParams(const GridView& gridView)
         : ParentType(gridView), eps_(3e-6)
     {
-        lensLowerLeft_[0]   = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftX);
-        lensLowerLeft_[1]   = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftY);
-        lensUpperRight_[0]  = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensUpperRightX);
-        lensUpperRight_[1]  = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensUpperRightY);
+        lensLowerLeft_   = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensLowerLeft);
+        lensUpperRight_  = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensUpperRight);
 
         // residual saturations
         lensMaterialParams_.setSwr(0.18);
@@ -109,10 +107,12 @@ public:
         outerMaterialParams_.setVgAlpha(0.0037);
         outerMaterialParams_.setVgn(4.7);
 
+        // initialize with zero
+        lensK_ = 0.0; outerK_ = 0.0;
         for (int i=0; i < dim; i++)
         {
-        lensK_[i][i] = 9.05e-12;
-        outerK_[i][i] = 4.6e-10;
+            lensK_[i][i] = 9.05e-12;
+            outerK_[i][i] = 4.6e-10;
         }
     }
 
diff --git a/test/common/generalproblem/test_generalproblem2p.input b/test/common/generalproblem/test_generalproblem2p.input
index f7606c8b66ed99bee195d623a254eb505641f703..72ddf0abd93b0fd9dd2ef50e2d6e92bc6a51678b 100644
--- a/test/common/generalproblem/test_generalproblem2p.input
+++ b/test/common/generalproblem/test_generalproblem2p.input
@@ -7,10 +7,8 @@ UpperRight = 6 4 # upper right corner coordinates [m]
 Cells = 48 32    # number of cells in (x, y)-direction [-]
 
 [SpatialParams]
-LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
-LensLowerLeftY = 2.0 # [m] y-coordinate of the lower left lens corner
-LensUpperRightX = 4.0 # [m] x-coordinate of the upper right lens corner
-LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
+LensLowerLeft = 1.0 2.0  # coordinates of the lower left lens corner [m]
+LensUpperRight = 4.0 3.0 # coordinates of the upper right lens corner [m]
 
 [Vtk]
 OutputLevel = 1
diff --git a/test/common/generalproblem/test_generalproblem2p_reference.input b/test/common/generalproblem/test_generalproblem2p_reference.input
index 2a70f32c810f454306226ba3b122e254cf0b3774..28b4611882b4b032bc482bf904a8ec66224dc9e2 100644
--- a/test/common/generalproblem/test_generalproblem2p_reference.input
+++ b/test/common/generalproblem/test_generalproblem2p_reference.input
@@ -7,10 +7,8 @@ UpperRight = 6 4 # upper right corner coordinates [m]
 Cells = 48 32    # number of cells in (x, y)-direction [-]
 
 [SpatialParams]
-LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
-LensLowerLeftY = 2.0 # [m] y-coordinate of the lower left lens corner
-LensUpperRightX = 4.0 # [m] x-coordinate of the upper right lens corner
-LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
+LensLowerLeft = 1.0 2.0  # coordinates of the lower left lens corner [m]
+LensUpperRight = 4.0 3.0 # coordinates of the upper right lens corner [m]
 
 [Vtk]
 OutputLevel = 1