diff --git a/test/decoupled/1p/test_1p.input b/test/decoupled/1p/test_1p.input
index 3b20e2108f49a7e32200057fdbecca76610837f2..fa0ab3033b74537b3911cddf41faf11fc0453bdd 100644
--- a/test/decoupled/1p/test_1p.input
+++ b/test/decoupled/1p/test_1p.input
@@ -4,6 +4,10 @@ TEnd = 0 # [s]
 
 [Problem]
 #Delta = 1e-6 # [-] if this is commented in, it is used
+EnableGravity = 0 #
+
+[LinearSolver]
+Verbosity = 1 # 
 
 [Grid]
 NumberOfCellsX = 1 # [-] resolution in x-direction
diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/decoupled/1p/test_1pproblem.hh
index da7e0f6be8297403bf2c910ae496c318eddc42fc..33a4afbfeff86273b40c382ddebf5fc5cde035ec 100644
--- a/test/decoupled/1p/test_1pproblem.hh
+++ b/test/decoupled/1p/test_1pproblem.hh
@@ -67,14 +67,8 @@ public:
 // Set the spatial parameters
 SET_TYPE_PROP(TestProblemOneP, SpatialParams, Dumux::TestOnePSpatialParams<TypeTag>);
 
-// Enable gravity
-SET_BOOL_PROP(TestProblemOneP, ProblemEnableGravity, false);
-
 //Set the problem
 SET_TYPE_PROP(TestProblemOneP, Problem, Dumux::TestProblemOneP<TypeTag>);
-
-
-SET_INT_PROP(TestProblemOneP, LinearSolverVerbosity, 1);
 }
 
 /*!
diff --git a/test/decoupled/1p/test_diffusion3d.input b/test/decoupled/1p/test_diffusion3d.input
index 0d0135bf74050a361f104db3d7a5d1373f631848..9cd3ef7ea0b3528423487710c6dcea15380f25f2 100644
--- a/test/decoupled/1p/test_diffusion3d.input
+++ b/test/decoupled/1p/test_diffusion3d.input
@@ -1,3 +1,6 @@
+[Problem]
+EnableGravity = 0 #
+
 [Grid]
 #File = ./grids/test_diffusion3d_sg.dgf
 File = ./grids/test_diffusion3d_ug1.dgf
diff --git a/test/decoupled/1p/test_diffusion3d_reference.input b/test/decoupled/1p/test_diffusion3d_reference.input
index 1c4d1abfb12d36c6f71a131545faf257edf5a686..573151e3db6b8d7ffd692b601470439dd0226a6d 100644
--- a/test/decoupled/1p/test_diffusion3d_reference.input
+++ b/test/decoupled/1p/test_diffusion3d_reference.input
@@ -1,3 +1,6 @@
+[Problem]
+EnableGravity = 0 #
+
 [Grid]
 File = ./grids/test_diffusion3d_ug1.dgf
 
diff --git a/test/decoupled/1p/test_diffusionproblem3d.hh b/test/decoupled/1p/test_diffusionproblem3d.hh
index 7962f3d8f88d89319df9c0888404cd83275801f4..6ce3bb1532d06dca1e60b87d17ccaf7ef90f0563 100644
--- a/test/decoupled/1p/test_diffusionproblem3d.hh
+++ b/test/decoupled/1p/test_diffusionproblem3d.hh
@@ -84,9 +84,6 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(DiffusionTestProblem, ProblemEnableGravity, false);
-
 #if HAVE_SUPERLU
 SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, Dumux::SuperLUBackend<TypeTag>);
 #else
diff --git a/test/decoupled/2p/test_3d2p.input b/test/decoupled/2p/test_3d2p.input
index 7d9e3522f58ad1bb6da5d1a794cd04ff1ed7a5fc..3dbfdc1292b57477014daea421e4e3ebbf48fa20 100644
--- a/test/decoupled/2p/test_3d2p.input
+++ b/test/decoupled/2p/test_3d2p.input
@@ -15,7 +15,8 @@ EnableSimpleLStencil = true
 EnableComplexLStencil =true
 
 [Problem]
-OutputInterval =0
+EnableGravity = 0 #
+OutputInterval = 0
 OutputTimeInterval = 1e3
 
 [Impet]
diff --git a/test/decoupled/2p/test_3d2pproblem.hh b/test/decoupled/2p/test_3d2pproblem.hh
index eff8903091a97839d68c93b705c9d153fc4c4aea..c4ba18fad9cdc3678d9c3557f9d0877d6aa5387a 100644
--- a/test/decoupled/2p/test_3d2pproblem.hh
+++ b/test/decoupled/2p/test_3d2pproblem.hh
@@ -102,9 +102,6 @@ public:
     typedef Dumux::Test3d2pSpatialParams<TypeTag> type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(ThreeDTwoPTestProblem, ProblemEnableGravity, false);
-
 #if PROBLEM == 1
 SET_TYPE_PROP(ThreeDTwoPTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
 SET_SCALAR_PROP(ThreeDTwoPTestProblem, ImpetCFLFactor, 1.0);
diff --git a/test/decoupled/2p/test_impes.input b/test/decoupled/2p/test_impes.input
index a9592a86f624a786be3bac12c7610181054ccccc..7ee80950266ca4b3dcf0a34473abd86e2c3055da 100644
--- a/test/decoupled/2p/test_impes.input
+++ b/test/decoupled/2p/test_impes.input
@@ -9,8 +9,12 @@ NumberOfCellsY = 6 # [-] resolution in y-direction
 UpperRightX = 300 # [m] length of the domain
 UpperRightY = 60 # [m] height of the domain
 
+[Impet]
+CFLFactor = 0.95 
+
 [Problem]
 Name = test_impes # name passed to the output routines
+EnableGravity = 0 
 
 [Vtk]
-OutputLevel = 0
\ No newline at end of file
+OutputLevel = 0
diff --git a/test/decoupled/2p/test_impesproblem.hh b/test/decoupled/2p/test_impesproblem.hh
index 3226590d59237ea6889e35a4a46e200ae5b8edb1..ffa2eb6a319a86ec5bb135e39955e1058e329878 100644
--- a/test/decoupled/2p/test_impesproblem.hh
+++ b/test/decoupled/2p/test_impesproblem.hh
@@ -109,13 +109,8 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(IMPESTestProblem, ProblemEnableGravity, false);
-
 SET_TYPE_PROP(IMPESTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
 
-SET_SCALAR_PROP(IMPESTestProblem, ImpetCFLFactor, 0.95);
-
 // set up an additional problem where the AMG backend is used
 NEW_TYPE_TAG(IMPESTestProblemWithAMG, INHERITS_FROM(IMPESTestProblem));
 // use the AMG backend for the corresponding test
diff --git a/test/decoupled/2p/test_transport.input b/test/decoupled/2p/test_transport.input
index 4bd644bd36e96bc84f90a7719f7316397a302398..82cc1afabbb8169eb474ef259d508a1fc49b2800 100644
--- a/test/decoupled/2p/test_transport.input
+++ b/test/decoupled/2p/test_transport.input
@@ -2,8 +2,9 @@
 TEnd = 1e4 # [s]
 DtInitial = 0 # [s]
 
+[Problem]
+EnableGravity = 0 
+
 [Grid]
 File = ./grids/test_transport.dgf
 
-[Vtk]
-
diff --git a/test/decoupled/2p/test_transportproblem.hh b/test/decoupled/2p/test_transportproblem.hh
index 0016dd384b3b924bd2f4d7b6bea672c9b0b095db..f9880967dd3c6cca5e38aaef1ffadbffb7bdfb84 100644
--- a/test/decoupled/2p/test_transportproblem.hh
+++ b/test/decoupled/2p/test_transportproblem.hh
@@ -76,11 +76,6 @@ public:
 
 SET_INT_PROP(TransportTestProblem, VelocityFormulation,
         DecoupledTwoPCommonIndices::velocityTotal);
-
-// Disable gravity
-SET_BOOL_PROP(TransportTestProblem, ProblemEnableGravity, false);
-
-SET_SCALAR_PROP(TransportTestProblem, ImpetCFLFactor, 1.0);
 }
 
 /*!
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2d.input b/test/decoupled/2p2c/test_adaptive2p2c2d.input
index 5ae3afd625211b77daec9001a6446fcc9e72f8e0..ff93681a2c6c54d946bf31b9dc31832c2bcffc74 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c2d.input
+++ b/test/decoupled/2p2c/test_adaptive2p2c2d.input
@@ -13,7 +13,6 @@ EnableMultiPointFluxApproximation = 1
 MaxInteractionVolumes = 2
 
 [Problem]
-
 SimulationName  = test_adaptive2p2c2d     # name of the output files
 OutputInterval = 5
 
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh b/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
index a9eb8e7180363e64a4468e791da42098f4a8e484..6261ea559588f6364e37de3c976b8477a3579826 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
+++ b/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
@@ -86,8 +86,6 @@ SET_PROP(Adaptive2p2c2d, Components) : public GET_PROP(TypeTag, DefaultComponent
 // Specify indicator
 SET_TYPE_PROP(Adaptive2p2c2d, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
 
-// Enable gravity
-SET_BOOL_PROP(Adaptive2p2c2d, ProblemEnableGravity, true);
 SET_BOOL_PROP(Adaptive2p2c2d, EnableCapillarity, true);
 SET_INT_PROP(Adaptive2p2c2d, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
 
diff --git a/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh b/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh
index 96d58a42e84a83e1db3699805f02d2f660bf6863..1552698662209abce0d845e5e1dd67c531062870 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh
+++ b/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh
@@ -85,8 +85,6 @@ SET_PROP(Adaptive2p2c3d, Components) : public GET_PROP(TypeTag, DefaultComponent
 // Specify indicator
 SET_TYPE_PROP(Adaptive2p2c3d, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
 
-// Enable gravity
-SET_BOOL_PROP(Adaptive2p2c3d, ProblemEnableGravity, true);
 SET_BOOL_PROP(Adaptive2p2c3d, EnableCapillarity, true);
 SET_BOOL_PROP(Adaptive2p2c3d, AdaptiveGrid, true);
 SET_INT_PROP(Adaptive2p2c3d, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index 11530eab43947046572a9b4cbfa1bdd4da894046..f102ffa3fb8dff8661fc37e312fc46472b5dc66b 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -79,11 +79,8 @@ SET_PROP(TestDecTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, DefaultC
 
 //SET_TYPE_PROP(TestDecTwoPTwoCProblem, LinearSolver, IMPETBiCGStabILU0Solver<TypeTag> );
 
-// Enable gravity
-SET_BOOL_PROP(TestDecTwoPTwoCProblem, ProblemEnableGravity, true);
 SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableCapillarity, true);
 SET_INT_PROP(TestDecTwoPTwoCProblem, BoundaryMobility, GET_PROP_TYPE(TypeTag, Indices)::satDependent);
-SET_SCALAR_PROP(TestDecTwoPTwoCProblem, ImpetCFLFactor, 0.8);
 }
 
 /*!
diff --git a/test/geomechanics/el1p2c/el1p2cproblem.hh b/test/geomechanics/el1p2c/el1p2cproblem.hh
index afa41cba2f9d5fd0ccdadbbdff7a16a437a3de2a..7ca1118dbd4c2cba372fb95884c4ce213c366606 100644
--- a/test/geomechanics/el1p2c/el1p2cproblem.hh
+++ b/test/geomechanics/el1p2c/el1p2cproblem.hh
@@ -67,9 +67,6 @@ namespace Dumux
     //Define whether mole(true) or mass (false) fractions are used
     SET_BOOL_PROP(El1P2CProblem, UseMoles, false);
 
-    // Disable gravity
-    SET_BOOL_PROP(El1P2CProblem, ProblemEnableGravity, false);
-
     // Include stabilization term to prevent pressure oscillations
     SET_BOOL_PROP(El1P2CProblem, ImplicitWithStabilization, true);
 
diff --git a/test/geomechanics/el1p2c/test_el1p2c.input b/test/geomechanics/el1p2c/test_el1p2c.input
index 48fea8b08bde4d4f39432f1a1265c633ad6a92c7..f0ff273c4c287f0bd2726ef5a66e03b6702979c5 100644
--- a/test/geomechanics/el1p2c/test_el1p2c.input
+++ b/test/geomechanics/el1p2c/test_el1p2c.input
@@ -2,6 +2,9 @@
 DtInitial = 10 # [s]
 TEnd = 1e4 # [s]
 
+[Problem]
+EnableGravity = 0
+
 [Grid]
 File = grids/test_el1p2c.dgf
 
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index 3828fafb50ccc0b3893d839a129a1fa1b4ded146..017b92a64432a03f11cb99f30d6dbdca2957c74f 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -114,17 +114,8 @@ public:
     typedef Dumux::InitialPressSat<GridView, Scalar> type;
 };
 
-SET_INT_PROP(El2P_TestProblem, LinearSolverVerbosity, 0);
-
 SET_SCALAR_PROP(El2P_TestProblem, NewtonMaxRelativeShift, 1e-5);
 
-// disable jacobian matrix recycling
-SET_BOOL_PROP(El2P_TestProblem, ImplicitEnableJacobianRecycling, false);
-// disable partial reassembling
-SET_BOOL_PROP(El2P_TestProblem, ImplicitEnablePartialReassemble, false);
-// Enable gravity
-SET_BOOL_PROP(El2P_TestProblem, ProblemEnableGravity, true);
-
 // use the algebraic multigrid
 SET_TYPE_PROP(El2P_TestProblem, LinearSolver, Dumux::El2PAMGBackend<TypeTag>);
 
diff --git a/test/geomechanics/el2p/test_el2p.input b/test/geomechanics/el2p/test_el2p.input
new file mode 100644
index 0000000000000000000000000000000000000000..e2c0ae5183563dc7045d5398cd7625890d4804c2
--- /dev/null
+++ b/test/geomechanics/el2p/test_el2p.input
@@ -0,0 +1,3 @@
+[Newton]
+RelTolerance = 1e-5 
+
diff --git a/test/geomechanics/elastic/elasticmatrixproblem.hh b/test/geomechanics/elastic/elasticmatrixproblem.hh
index a8487bd6c12a552b24c6cc0003799dc47e3afb6b..1ccd5c09506e7e1ceed6af1fa55223c9cd65fa6c 100644
--- a/test/geomechanics/elastic/elasticmatrixproblem.hh
+++ b/test/geomechanics/elastic/elasticmatrixproblem.hh
@@ -47,8 +47,6 @@ SET_TYPE_PROP(ElasticMatrixProblem, Grid, Dune::YaspGrid<3>);
 // Set the problem property
 SET_TYPE_PROP(ElasticMatrixProblem, Problem, Dumux::ElasticMatrixProblem<TypeTag>); 
 
-// Enable gravity
-SET_BOOL_PROP(ElasticMatrixProblem, ProblemEnableGravity, false);
 }
 
 /*!
diff --git a/test/geomechanics/elastic/test_elastic.input b/test/geomechanics/elastic/test_elastic.input
index 2b46f502d86a59708dc6cf6099b5c217663a52f5..37d6ae168f60433d6efe4d4c48feecc00bfbf86b 100644
--- a/test/geomechanics/elastic/test_elastic.input
+++ b/test/geomechanics/elastic/test_elastic.input
@@ -2,6 +2,9 @@
 DtInitial = 1 # [s]
 TEnd = 1 # [s]
 
+[Problem]
+EnableGravity = 0
+
 [Grid]
 File = grids/test_elastic.dgf