diff --git a/AMDiS/cmake3/test_compile_features.cmake b/AMDiS/cmake3/test_compile_features.cmake
index cf92edf83977ccbfc78bdbe7de348074decf7592..d905b453b11f9770d86f4e025f534a0fcede2050 100644
--- a/AMDiS/cmake3/test_compile_features.cmake
+++ b/AMDiS/cmake3/test_compile_features.cmake
@@ -1,5 +1,5 @@
 
-macro(test_compile_features RESULT_VAR TARGET SCOPE) # feature1 feature2 feature3 ...)
+function(test_compile_features RESULT_VAR TARGET SCOPE) # feature1 feature2 feature3 ...)
     set(_FEATURES "")
     foreach(FEATURE ${ARGN})
         set(_FEATURES "${_FEATURES} ${FEATURE}")
@@ -11,7 +11,7 @@ macro(test_compile_features RESULT_VAR TARGET SCOPE) # feature1 feature2 feature
         return ()
     endif ()
 
-    set(_DIR ${BASE_DIR}/cmake3/tmp)
+    set(_DIR ${CMAKE_BINARY_DIR}/test_cxx11)
 
     message(STATUS "Test for cxx11 features for target ${TARGET}")
     execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${_DIR})
@@ -35,7 +35,7 @@ macro(test_compile_features RESULT_VAR TARGET SCOPE) # feature1 feature2 feature
     endif ()
     mark_as_advanced(${RESULT_VAR})
 
-    unset(_RES_VAR)
-    unset(_DIR)
-    unset(_FEATURES)
-endmacro(test_compile_features)
\ No newline at end of file
+    #unset(_RES_VAR)
+    #unset(_DIR)
+    #unset(_FEATURES)
+endfunction(test_compile_features)
\ No newline at end of file
diff --git a/demo/init/ellipt.dat.2d b/demo/init/ellipt.dat.2d
index bab84baa5ba1ac77c3f5eb3345a55047a9230b9b..edef5295801b6357d8515b33f24c4c5d7ed8cdfd 100644
--- a/demo/init/ellipt.dat.2d
+++ b/demo/init/ellipt.dat.2d
@@ -27,9 +27,9 @@ ellipt->marker[0]->MSGamma:        0.5
 ellipt->adapt[0]->tolerance:          1e-4
 ellipt->adapt[0]->refine bisections:  2
 
-ellipt->adapt->max iteration:         10
+ellipt->adapt->max iteration:         0
 
-ellipt->output->filename:       output/ellipt.2d
+ellipt->output->filename:       output/ellipt_r0.2d
 ellipt->output->ParaView format: 1
 ellipt->output->ParaView mode: 1
 ellipt->output->ARH2 format: 1