diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh
index cb56a2809fd189c32bef14d986407806ab0fd876..cf2ca95acff5694d3f7219e92ae5f1fd72e1eedc 100644
--- a/test/common/generalproblem/generallensproblem.hh
+++ b/test/common/generalproblem/generallensproblem.hh
@@ -90,9 +90,6 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(GeneralLensProblem, ProblemEnableGravity, true);
-
 ///////////////////////////////////////////////////
 // Box model TypeTag
 //////////////////////////////////////////////////
@@ -120,10 +117,6 @@ SET_TYPE_PROP(DecoupledGeneralLensProblem, SpatialParamsBaseClass, Dumux::FVSpat
 
 SET_INT_PROP(DecoupledGeneralLensProblem, Formulation,
         DecoupledTwoPCommonIndices::pwsn);
-
-SET_INT_PROP(DecoupledGeneralLensProblem, VtkOutputLevel, 1);
-
-SET_SCALAR_PROP(DecoupledGeneralLensProblem, ImpetCFLFactor, 0.95);
 }
 
 /*!
diff --git a/test/common/generalproblem/generallensspatialparams.hh b/test/common/generalproblem/generallensspatialparams.hh
index 14a0b28d5607f82a70eed67eb0aa9e1a610a77fb..07636ab59a1d29bc908080439e043182e00ea921 100644
--- a/test/common/generalproblem/generallensspatialparams.hh
+++ b/test/common/generalproblem/generallensspatialparams.hh
@@ -91,21 +91,10 @@ public:
     GeneralLensSpatialParams(const GridView& gridView)
         : ParentType(gridView)
     {
-        try
-        {
-            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);
-        }
-        catch (Dumux::ParameterException &e) {
-            std::cerr << e << ". Abort!\n";
-            exit(1) ;
-        }
-        catch (...) {
-            std::cerr << "Unknown exception thrown!\n";
-            exit(1);
-        }
+        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);
 
         // residual saturations
         lensMaterialParams_.setSwr(0.18);
diff --git a/test/common/generalproblem/test_generalproblem2p.input b/test/common/generalproblem/test_generalproblem2p.input
index 8728185dbbaf92387dbf76e2f965600bff35c89a..6b2d18c0d0ce96be0d90a9238163f1a48b876f0f 100644
--- a/test/common/generalproblem/test_generalproblem2p.input
+++ b/test/common/generalproblem/test_generalproblem2p.input
@@ -3,11 +3,11 @@ DtInitial = 250 # [s]
 TEnd = 3000 # [s]
 
 [Grid]
-NumberOfCellsX = 48# [-] level 0 resolution in x-direction
-NumberOfCellsY = 32# [-] level 0 resolution in y-direction
+NumberOfCellsX = 48 # [-] level 0 resolution in x-direction
+NumberOfCellsY = 32 # [-] level 0 resolution in y-direction
 
-UpperRightX = 6# [m] dimension of the grid
-UpperRightY = 4# [m] dimension of the grid
+UpperRightX = 6 # [m] dimension of the grid
+UpperRightY = 4 # [m] dimension of the grid
 
 [SpatialParams]
 LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
@@ -15,3 +15,9 @@ 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
 
+[Vtk]
+OutputLevel = 1
+
+[Impet]
+CFLFactor = 0.95
+
diff --git a/test/common/generalproblem/test_generalproblem2p_reference.input b/test/common/generalproblem/test_generalproblem2p_reference.input
index 4bfaaa1b4926532589647c95171b0a63f933c185..b4e041b8f546c1637e71f91de26908b7d2a6563f 100644
--- a/test/common/generalproblem/test_generalproblem2p_reference.input
+++ b/test/common/generalproblem/test_generalproblem2p_reference.input
@@ -3,11 +3,11 @@ DtInitial = 2e1 # [s]
 TEnd = 1e2 # [s]
 
 [Grid]
-NumberOfCellsX = 48# [-] level 0 resolution in x-direction
-NumberOfCellsY = 32# [-] level 0 resolution in y-direction
+NumberOfCellsX = 48 # [-] level 0 resolution in x-direction
+NumberOfCellsY = 32 # [-] level 0 resolution in y-direction
 
-UpperRightX = 6# [m] dimension of the grid
-UpperRightY = 4# [m] dimension of the grid
+UpperRightX = 6 # [m] dimension of the grid
+UpperRightY = 4 # [m] dimension of the grid
 
 [SpatialParams]
 LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
@@ -15,3 +15,9 @@ 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
 
+[Vtk]
+OutputLevel = 1
+
+[Impet]
+CFLFactor = 0.95
+
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.cc b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.cc
index 56adbdd00bd70aa6901b6f6a1a985fbc574e0da3..e5d404de41f4e56f9b65fe9d722752e2789ce699 100644
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.cc
+++ b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.cc
@@ -112,26 +112,16 @@ int start_(int argc,
     int gridRefinement;
     bool useInterfaceMeshCreator;
 
-    try
-    {
-    	dgfFileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Grid, File);
-    	dt = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial);
-    	tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, TEnd);
-	    nElements[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsX);
-    	nElements[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsY);
-    	interfacePosY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
-    	gradingFactorY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, GradingFactorY);
-    	gridRefinement = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, Refinement);
-    	useInterfaceMeshCreator = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Grid, UseInterfaceMeshCreator);
-    }
-    catch (Dumux::ParameterException &e) {
-        std::cerr << e << ". Abort!\n";
-        exit(1) ;
-    }
-    catch (...) {
-        std::cerr << "Unknown exception thrown!\n";
-        exit(1);
-    }
+    dgfFileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Grid, File);
+    dt = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial);
+    tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, TEnd);
+	nElements[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsX);
+    nElements[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsY);
+    interfacePosY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
+    gradingFactorY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, GradingFactorY);
+    gridRefinement = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, Refinement);
+    useInterfaceMeshCreator = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Grid, UseInterfaceMeshCreator);
+
     std::cout << "Starting with timestep size = " << dt << "s, simulation end = " << tEnd << "s\n";
 
     if (useInterfaceMeshCreator)
diff --git a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.cc b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.cc
index 575bb046311bb0d6a908fe5f6ee1b791570efe8f..e45fde0a4300750ec90c80c890e21a0318b98515 100644
--- a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.cc
+++ b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.cc
@@ -109,25 +109,15 @@ int start_(int argc,
     Scalar interfacePosY, gradingFactorY;
     bool useInterfaceMeshCreator;
 
-    try
-    {
-        dgfFileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Grid, File);
-        dt = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial);
-        tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, TEnd);
-        nElements[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsX);
-        nElements[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsY);
-        interfacePosY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
-        gradingFactorY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, GradingFactorY);
-        useInterfaceMeshCreator = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Grid, UseInterfaceMeshCreator);
-    }
-    catch (Dumux::ParameterException &e) {
-        std::cerr << e << ". Abort!\n";
-        exit(1) ;
-    }
-    catch (...) {
-        std::cerr << "Unknown exception thrown!\n";
-        exit(1);
-    }
+    dgfFileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Grid, File);
+    dt = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial);
+    tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, TEnd);
+    nElements[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsX);
+    nElements[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, CellsY);
+    interfacePosY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
+    gradingFactorY = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, GradingFactorY);
+    useInterfaceMeshCreator = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Grid, UseInterfaceMeshCreator);
+
     std::cout << "Starting with timestep size = " << dt << "s, simulation end = " << tEnd << "s\n";
 
     if (useInterfaceMeshCreator)