diff --git a/cmake/modules/DuneFemDgMacros.cmake b/cmake/modules/DuneFemDgMacros.cmake
index 8b58191473eb0ed26ef5275dac7be7508e0b9c5c..feaa3cf9f682a299339345ea364d9de3e25b1fd4 100644
--- a/cmake/modules/DuneFemDgMacros.cmake
+++ b/cmake/modules/DuneFemDgMacros.cmake
@@ -1,10 +1,19 @@
 # the main files for all the tests are in the same dir
 set(FEMDG_MAIN_DIR "${CMAKE_SOURCE_DIR}/dune/fem-dg/main")
 
-set(GENERATE_FEMDG_PARAMETER_FILE TRUE)
-#if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-#  set(GENERATE_FEMDG_PARAMETER_FILE FALSE)
-#endif()
+set(INSOURCE_FEMDG_PARAMETER_FILE TRUE)
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+  set(INSOURCE_FEMDG_PARAMETER_FILE FALSE)
+endif()
+
+# macro for configuring the parameter files from parameter.in
+macro(configure_parameter_file)
+  set(CURRENT_PARAMETER_PATH .)
+  if(INSOURCE_FEMDG_PARAMETER_FILE)
+    set(CURRENT_PARAMETER_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+  configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
+endmacro(configure_parameter_file)
 
 # do a fast test build by default,
 # i.e. only build the most important tests
diff --git a/dune/fem-dg/examples/advdiff/test/CMakeLists.txt b/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
index 291b7c8984988a009ec3b8fa986f7cc9c8b5eb5b..b60c11d6e3b82db5031492476a39367c50ece6f0 100644
--- a/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/advdiff/")
-if(GENERATE_FEMDG_PARAMETER_FILE)
-  configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
-endif()
+
+# configure parameter file from parameter.in
+configure_parameter_file()
 
 add_definitions( "-DYASPGRID" )
 add_definitions( "-DGRIDDIM=2" )
diff --git a/dune/fem-dg/examples/advdiff/test/parameter.in b/dune/fem-dg/examples/advdiff/test/parameter.in
index f0ba369e75986df1ad416e858e2166ff131348ed..22ee75259891f3ebaeb710b9812c4654fb85f482 100644
--- a/dune/fem-dg/examples/advdiff/test/parameter.in
+++ b/dune/fem-dg/examples/advdiff/test/parameter.in
@@ -2,7 +2,7 @@
 # (-1: off, p: process p is verbose, in general 0 is a good choice)
 fem.verboserank: 0 
 
-fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data # specify directory for data output (is created if not exists)
-fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}
+fem.prefix: ${CURRENT_PARAMETER_PATH}/data # specify directory for data output (is created if not exists)
+fem.prefix.input: ${CURRENT_PARAMETER_PATH}
 
 paramfile: parameter_cmake
diff --git a/dune/fem-dg/examples/dataio/test/CMakeLists.txt b/dune/fem-dg/examples/dataio/test/CMakeLists.txt
index 297a7dd5d98464fcdc794e9b7979489ed4393ab0..fcb4cf6e09812feed511dbbc14fcb9dbe643ff52 100644
--- a/dune/fem-dg/examples/dataio/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/dataio/test/CMakeLists.txt
@@ -1,8 +1,6 @@
 include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/dataio/")
-
-if(GENERATE_FEMDG_PARAMETER_FILE)
-  configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
-endif()
+# configure parameter file from parameter.in
+configure_parameter_file()
 
 add_definitions( "-DALUGRID_SIMPLEX" )
 add_definitions( "-DGRIDDIM=3" )
diff --git a/dune/fem-dg/examples/dataio/test/parameter.in b/dune/fem-dg/examples/dataio/test/parameter.in
index f0ba369e75986df1ad416e858e2166ff131348ed..22ee75259891f3ebaeb710b9812c4654fb85f482 100644
--- a/dune/fem-dg/examples/dataio/test/parameter.in
+++ b/dune/fem-dg/examples/dataio/test/parameter.in
@@ -2,7 +2,7 @@
 # (-1: off, p: process p is verbose, in general 0 is a good choice)
 fem.verboserank: 0 
 
-fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data # specify directory for data output (is created if not exists)
-fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}
+fem.prefix: ${CURRENT_PARAMETER_PATH}/data # specify directory for data output (is created if not exists)
+fem.prefix.input: ${CURRENT_PARAMETER_PATH}
 
 paramfile: parameter_cmake
diff --git a/dune/fem-dg/examples/euler/test/CMakeLists.txt b/dune/fem-dg/examples/euler/test/CMakeLists.txt
index ed48ef233c4f2faf1150e9d2f1109d0b459e5556..e1a391f38a3a5bbeb9e41e2ef22092ef41000852 100644
--- a/dune/fem-dg/examples/euler/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/euler/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/euler/")
-if(GENERATE_FEMDG_PARAMETER_FILE)
-  configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
-endif()
+
+# configure parameter file from parameter.in
+configure_parameter_file()
 
 add_definitions( "-DYASPGRID" )
 add_definitions( "-DGRIDDIM=2" )
diff --git a/dune/fem-dg/examples/euler/test/parameter b/dune/fem-dg/examples/euler/test/parameter
deleted file mode 100644
index 5c878d2879acb09de271c683798f43269c91b4cd..0000000000000000000000000000000000000000
--- a/dune/fem-dg/examples/euler/test/parameter
+++ /dev/null
@@ -1,8 +0,0 @@
-# toggle verbosity of on process 
-# (-1: off, p: process p is verbose, in general 0 is a good choice)
-fem.verboserank: 0 
-
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/examples/euler/data # specify directory for data output (is created if not exists)
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/examples/euler
-
-paramfile: parameter_cmake
diff --git a/dune/fem-dg/examples/euler/test/parameter.in b/dune/fem-dg/examples/euler/test/parameter.in
index f0ba369e75986df1ad416e858e2166ff131348ed..66a3d59815239604476ced2e05e31585a1dcfdf0 100644
--- a/dune/fem-dg/examples/euler/test/parameter.in
+++ b/dune/fem-dg/examples/euler/test/parameter.in
@@ -2,7 +2,7 @@
 # (-1: off, p: process p is verbose, in general 0 is a good choice)
 fem.verboserank: 0 
 
-fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data # specify directory for data output (is created if not exists)
-fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}
+fem.prefix: ${CURRENT_PARAMETER_PATH}/data # specify directory for data output (is created if not exists)
+fem.prefix.input: ${CURRENT_PARAMETER_PATH}/
 
 paramfile: parameter_cmake
diff --git a/dune/fem-dg/examples/euler/test/parameter_cmake b/dune/fem-dg/examples/euler/test/parameter_cmake
index 8280a4ed347628161cb14e6fb65b17af074c5bfa..dbb276161bb07527b5aa7c1caa36ad394f9acfa7 100644
--- a/dune/fem-dg/examples/euler/test/parameter_cmake
+++ b/dune/fem-dg/examples/euler/test/parameter_cmake
@@ -37,7 +37,7 @@ paramfile: ../../parameter/paramBase
 
 # STEPPER
 #--------
-fem.eoc.steps: 6
+fem.eoc.steps: 5
 femdg.stepper.starttime: 0.
 femdg.stepper.endtime: 0.15
 femdg.stepper.maxtimestep: 0.1
diff --git a/dune/fem-dg/examples/incompnavierstokes/test/CMakeLists.txt b/dune/fem-dg/examples/incompnavierstokes/test/CMakeLists.txt
index 3599ee40a76d4b0c42796461df7925a86ce71666..3b4071bb2b7ce9fb13209e88732e892f9d91c0b7 100644
--- a/dune/fem-dg/examples/incompnavierstokes/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/incompnavierstokes/test/CMakeLists.txt
@@ -1,5 +1,6 @@
 include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/incompnavierstokes/")
-configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter )
+# configure parameter file from parameter.in
+configure_parameter_file()
 
 # default settings for the test case
 add_definitions( "-DYASPGRID" )
diff --git a/dune/fem-dg/examples/incompnavierstokes/test/parameter.in b/dune/fem-dg/examples/incompnavierstokes/test/parameter.in
index aaad5fa92290dfc76b41f229adbb703626714b9a..a2b3bd5e8431016e7d11ec611eada4344f837e83 100644
--- a/dune/fem-dg/examples/incompnavierstokes/test/parameter.in
+++ b/dune/fem-dg/examples/incompnavierstokes/test/parameter.in
@@ -2,8 +2,8 @@ fem.verboserank: 0
 
 # DATA WRITER
 #------------
-fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data
-fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}
+fem.prefix: ${CURRENT_PARAMETER_PATH}/data
+fem.prefix.input: ${CURRENT_PARAMETER_PATH}
 
 paramfile: parameter_cmake
 
diff --git a/dune/fem-dg/examples/navierstokes/test/CMakeLists.txt b/dune/fem-dg/examples/navierstokes/test/CMakeLists.txt
index 1035c7ad1c5249390e72fbed3dbd9c39e5df5698..9b99d66034bf4d148e0e9fdf4bc520e236e38f4e 100644
--- a/dune/fem-dg/examples/navierstokes/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/navierstokes/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/navierstokes/")
-if(GENERATE_FEMDG_PARAMETER_FILE)
-  configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter )
-endif()
+# configure parameter file from parameter.in
+configure_parameter_file()
 
 # default settings for the test case
 add_definitions( "-DALUGRID_SIMPLEX" )
diff --git a/dune/fem-dg/examples/navierstokes/test/parameter.in b/dune/fem-dg/examples/navierstokes/test/parameter.in
index aaad5fa92290dfc76b41f229adbb703626714b9a..a2b3bd5e8431016e7d11ec611eada4344f837e83 100644
--- a/dune/fem-dg/examples/navierstokes/test/parameter.in
+++ b/dune/fem-dg/examples/navierstokes/test/parameter.in
@@ -2,8 +2,8 @@ fem.verboserank: 0
 
 # DATA WRITER
 #------------
-fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data
-fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}
+fem.prefix: ${CURRENT_PARAMETER_PATH}/data
+fem.prefix.input: ${CURRENT_PARAMETER_PATH}
 
 paramfile: parameter_cmake
 
diff --git a/dune/fem-dg/examples/parameter/paramSolver b/dune/fem-dg/examples/parameter/paramSolver
index 208d41a4130ba3e66aa183684f9786676d515fb6..d5134bfdd2868d3e128df418d7c2349d121b71af 100644
--- a/dune/fem-dg/examples/parameter/paramSolver
+++ b/dune/fem-dg/examples/parameter/paramSolver
@@ -9,7 +9,7 @@ fem.ode.miniterations: 95
 fem.ode.maxiterations: 105
 fem.ode.cflStart: 1.
 #fem.ode.cflMax: 5
-fem.timeprovider.factor: 0.15
+fem.timeprovider.factor: 0.45
 fem.timeprovider.updatestep: 1
 
 # parameter for the implicit solvers 
diff --git a/dune/fem-dg/examples/poisson/test/CMakeLists.txt b/dune/fem-dg/examples/poisson/test/CMakeLists.txt
index 34f24873b8c749a89bac8fbb5ec6a2e84d18ba48..3631b88fc5b77b904dabfe2f68e4be910e5e202e 100644
--- a/dune/fem-dg/examples/poisson/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/poisson/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/poisson/")
-if(GENERATE_FEMDG_PARAMETER_FILE)
-  configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
-endif()
+# configure parameter file from parameter.in
+configure_parameter_file()
 
 add_definitions( "-DALUGRID_CUBE" )
 add_definitions( "-DGRIDDIM=2" )
diff --git a/dune/fem-dg/examples/poisson/test/parameter.in b/dune/fem-dg/examples/poisson/test/parameter.in
index 564a176ce5ad886e9914b51c1c4301fc61c06563..be46e412e821c31fbeede118b7c780edcd24cd8e 100644
--- a/dune/fem-dg/examples/poisson/test/parameter.in
+++ b/dune/fem-dg/examples/poisson/test/parameter.in
@@ -3,7 +3,7 @@
 fem.verboserank: 0
 
 # specify directory for data output (is created if not exists)
-fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data
-fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}
+fem.prefix: ${CURRENT_PARAMETER_PATH}/data
+fem.prefix.input: ${CURRENT_PARAMETER_PATH}
 
 paramfile: parameter_cmake
diff --git a/dune/fem-dg/examples/stokes/test/CMakeLists.txt b/dune/fem-dg/examples/stokes/test/CMakeLists.txt
index 448a4ac7f0f5c4ec1c2fc37a1fdceee7609c4486..5eec09637ac697ed893fe3b9a7105b308a52321a 100644
--- a/dune/fem-dg/examples/stokes/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/stokes/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/stokes/")
-if(GENERATE_FEMDG_PARAMETER_FILE)
-  configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
-endif()
+# configure parameter file from parameter.in
+configure_parameter_file()
 
 add_definitions( "-DYASPGRID" )
 add_definitions( "-DGRIDDIM=2" )
diff --git a/dune/fem-dg/examples/stokes/test/parameter.in b/dune/fem-dg/examples/stokes/test/parameter.in
index 2b5e4af5c056f551343a3a6f6d2b1036745cfc04..935434b23c5dcf4d3286ffe949dc3aae42295f17 100644
--- a/dune/fem-dg/examples/stokes/test/parameter.in
+++ b/dune/fem-dg/examples/stokes/test/parameter.in
@@ -2,7 +2,7 @@
 # (-1: off, p: process p is verbose, in general 0 is a good choice)
 fem.verboserank: 0
 
-fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data # specify directory for data output (is created if not exists)
-fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}
+fem.prefix: ${CURRENT_PARAMETER_PATH}/data # specify directory for data output (is created if not exists)
+fem.prefix.input: ${CURRENT_PARAMETER_PATH}
 
 paramfile: parameter_cmake