diff --git a/test/decoupled/1p/test_1p.cc b/test/decoupled/1p/test_1p.cc
index 674395f982600c303d18db624ef37c9d3eda2eaf..0b567cc6289a0259a494960d4db51ee3ed40e891 100644
--- a/test/decoupled/1p/test_1p.cc
+++ b/test/decoupled/1p/test_1p.cc
@@ -29,11 +29,10 @@
  */
 #include "config.h"
 
-//#include <dumux/common/structuredgridcreator.hh>
 #include "test_1p_problem.hh"
 #include "benchmarkresult.hh"
 #include <dumux/common/start.hh>
-#include <dumux/common/structuredgridcreator.hh>
+#include <dumux/common/structuredcubegridcreator.hh>
 
 
 #include <iostream>
@@ -76,7 +75,7 @@ int main(int argc, char** argv)
 {
     typedef TTAG(TestProblemOneP) ProblemTypeTag;
 
-    return Dumux::startWithParameters<ProblemTypeTag>(argc, argv, usage);
+    return Dumux::start<ProblemTypeTag>(argc, argv, usage);
 }
 
 //! \cond INTERNAL
diff --git a/test/decoupled/1p/test_diffusion_problem.hh b/test/decoupled/1p/test_diffusion_problem.hh
index 16b8ce95f467541954670f8d5c0ba3c1c45ba418..6994a185814311474dd900a4da2ea095d057ab2a 100644
--- a/test/decoupled/1p/test_diffusion_problem.hh
+++ b/test/decoupled/1p/test_diffusion_problem.hh
@@ -207,12 +207,18 @@ public:
 
     TestDiffusionProblem(const GridView &gridView, const double delta = 1.0) :
         ParentType(gridView), delta_(delta), velocity_(*this)
+    {}
+
+    //!initializes the saturation and afterwards the model
+    void init()
     {
+        this->variables().initialize();
         this->spatialParameters().setDelta(delta_);
-        for (int i = 0; i < gridView.size(0); i++)
+        for (int i = 0; i < this->gridView().size(0); i++)
         {
             this->variables().cellData(i).setSaturation(wPhaseIdx, 1.0);
         }
+        this->model().initialize();
     }
 
     /*!
diff --git a/test/decoupled/2p/test_impes.cc b/test/decoupled/2p/test_impes.cc
index 18a7bb852e94fb8a8c79413e5175ecf1ca148ef7..64ad25a6f30c6a22d3eb528f92327fb135a6b4a7 100644
--- a/test/decoupled/2p/test_impes.cc
+++ b/test/decoupled/2p/test_impes.cc
@@ -31,7 +31,7 @@
 #include "test_impes_problem.hh"
 #include <dumux/common/start.hh>
 
-#include <dumux/common/structuredgridcreator.hh>
+#include <dumux/common/structuredcubegridcreator.hh>
 
 #include <dune/grid/common/gridinfo.hh>
 
@@ -74,7 +74,7 @@ void usage(const char *progName, const std::string &errorMsg)
 int main(int argc, char** argv)
 {
     typedef TTAG(IMPESTestProblem) ProblemTypeTag;
-    return Dumux::startWithParameters<ProblemTypeTag>(argc, argv, usage);
+    return Dumux::start<ProblemTypeTag>(argc, argv, usage);
 }
 
 //! \cond INTERNAL
diff --git a/test/decoupled/2p/test_transport.cc b/test/decoupled/2p/test_transport.cc
index e262168875b1d271795b0c236b531ed1145e0be0..31a78aa93e0a365d5d5c8be98d05506d20b120d6 100644
--- a/test/decoupled/2p/test_transport.cc
+++ b/test/decoupled/2p/test_transport.cc
@@ -71,6 +71,6 @@ void usage(const char *progName, const std::string &errorMsg)
 int main(int argc, char** argv)
 {
     typedef TTAG(TransportTestProblem) ProblemTypeTag;
-    return Dumux::startWithParameters<ProblemTypeTag>(argc, argv, usage);
+    return Dumux::start<ProblemTypeTag>(argc, argv, usage);
 }
 
diff --git a/test/decoupled/2p/test_transport_problem.hh b/test/decoupled/2p/test_transport_problem.hh
index ac2b8dc30910ad3e0c7969726ffe5d2459f396fa..ae1493fed5e16dd762e73e83f6f0916980a2094d 100644
--- a/test/decoupled/2p/test_transport_problem.hh
+++ b/test/decoupled/2p/test_transport_problem.hh
@@ -149,14 +149,20 @@ class TestTransportProblem: public TransportProblem2P<TypeTag>
 public:
     TestTransportProblem(TimeManager &timeManager, const GridView &gridView) :
         ParentType(timeManager, gridView), eps_(1e-6)
+    {}
+
+
+    //!set initial velocity field -> v_total is assumed to be constant in this test!
+    void init()
     {
+        ParentType::init();
 
         GlobalPosition vel(0);
         vel[0] = 1e-5;
 
         // compute update vector
-        ElementIterator eItEnd = gridView.template end<0> ();
-        for (ElementIterator eIt = gridView.template begin<0> (); eIt != eItEnd; ++eIt)
+        ElementIterator eItEnd = this->gridView().template end<0> ();
+        for (ElementIterator eIt = this->gridView().template begin<0> (); eIt != eItEnd; ++eIt)
         {
             // cell index
             int globalIdx = this->elementMapper().map(*eIt);
@@ -164,8 +170,8 @@ public:
             CellData& cellData = this->variables().cellData(globalIdx);
 
             // run through all intersections with neighbors and boundary
-            IntersectionIterator isItEnd = gridView.iend(*eIt);
-            for (IntersectionIterator isIt = gridView.ibegin(*eIt); isIt != isItEnd; ++isIt)
+            IntersectionIterator isItEnd = this->gridView().iend(*eIt);
+            for (IntersectionIterator isIt = this->gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
             {
                 // local number of facet
                 int indexInInside = isIt->indexInInside();
diff --git a/test/decoupled/2p2c/test_dec2p2c.cc b/test/decoupled/2p2c/test_dec2p2c.cc
index 3e3cc6ec79e6c36b39dad9d78ddfedc7ff774f85..feb10177638a56eb00562323d4f1205f940f39ca 100644
--- a/test/decoupled/2p2c/test_dec2p2c.cc
+++ b/test/decoupled/2p2c/test_dec2p2c.cc
@@ -30,7 +30,7 @@
 #include "test_dec2p2cproblem.hh"
 #include <dumux/common/start.hh>
 
-#include <dumux/common/structuredgridcreator.hh>
+#include <dumux/common/structuredcubegridcreator.hh>
 
 #include <dune/grid/common/gridinfo.hh>
 #include <dune/common/exceptions.hh>
@@ -72,7 +72,7 @@ void usage(const char *progName, const std::string &errorMsg)
 int main(int argc, char** argv)
 {
     typedef TTAG(TestDecTwoPTwoCProblem) ProblemTypeTag;
-    return Dumux::startWithParameters<ProblemTypeTag>(argc, argv, usage);
+    return Dumux::start<ProblemTypeTag>(argc, argv, usage);
 }
 
 //! \cond INTERNAL