diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 712ae30a1ab830be729fd13a954b39b4a57e6a50..61cde157a1e2c4d6c79d7015beb16fcd4ad58f17 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,5 @@
-# directories which are commented out do not compile at the moment
-# (they also don't compile if using the old build system)!
-
 add_subdirectory("boxmodels")
-add_subdirectory("material")
 add_subdirectory("common")
 add_subdirectory("decoupled")
-
+add_subdirectory("freeflow")
+add_subdirectory("material")
diff --git a/test/boxmodels/1p/CMakeLists.txt b/test/boxmodels/1p/CMakeLists.txt
index 0f1ffb7146135a12f041d6dea968dc2fa9ed1a4a..e0de7f2930880b932043576e1c1d6678177059b6 100644
--- a/test/boxmodels/1p/CMakeLists.txt
+++ b/test/boxmodels/1p/CMakeLists.txt
@@ -1,10 +1,10 @@
 # build target for the onephase-onecomponent test problem
-ADD_EXECUTABLE("test_1p" test_1p.cc)
-TARGET_LINK_LIBRARIES("test_1p" ${DumuxLinkLibraries})
+add_executable("test_1p" test_1p.cc)
+target_link_libraries("test_1p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_1p"
diff --git a/test/boxmodels/1p2c/CMakeLists.txt b/test/boxmodels/1p2c/CMakeLists.txt
index e600c7d807221ecd0d7ca806337d7553a80e1625..39bbe2125e9e365ca74b5b033988a1a7f3dc3e86 100644
--- a/test/boxmodels/1p2c/CMakeLists.txt
+++ b/test/boxmodels/1p2c/CMakeLists.txt
@@ -1,9 +1,9 @@
-ADD_EXECUTABLE("test_1p2c" test_1p2c.cc)
-TARGET_LINK_LIBRARIES("test_1p2c" ${DumuxLinkLibraries})
+add_executable("test_1p2c" test_1p2c.cc)
+target_link_libraries("test_1p2c" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_1p2c"
diff --git a/test/boxmodels/2p/CMakeLists.txt b/test/boxmodels/2p/CMakeLists.txt
index 876ad415f61cd4c789abb49fda7abab2129130c5..4e6c6cc09d851eef281b0ec55d81d82189a6af69 100644
--- a/test/boxmodels/2p/CMakeLists.txt
+++ b/test/boxmodels/2p/CMakeLists.txt
@@ -1,10 +1,10 @@
 # build target for the simple twophase lens problem
-ADD_EXECUTABLE("test_2p" test_2p.cc)
-TARGET_LINK_LIBRARIES("test_2p" ${DumuxLinkLibraries})
+add_executable("test_2p" test_2p.cc)
+target_link_libraries("test_2p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_2p"
@@ -13,4 +13,3 @@ add_custom_command(TARGET "test_2p"
                         copy_directory 
                            "${CMAKE_CURRENT_SOURCE_DIR}/grids"
                            "${CMAKE_CURRENT_BINARY_DIR}/grids")
-
diff --git a/test/boxmodels/2p2c/CMakeLists.txt b/test/boxmodels/2p2c/CMakeLists.txt
index 9faa5f78026e58a0a7cdf3e055b6deb5ffe17aeb..d18f05fa2b800f7fb0721c6a6a613fb15c2c5783 100644
--- a/test/boxmodels/2p2c/CMakeLists.txt
+++ b/test/boxmodels/2p2c/CMakeLists.txt
@@ -1,10 +1,10 @@
 # build target for the twophase-twocomponent test problem
-ADD_EXECUTABLE("test_2p2c" test_2p2c.cc)
-TARGET_LINK_LIBRARIES("test_2p2c" ${DumuxLinkLibraries})
+add_executable("test_2p2c" test_2p2c.cc)
+target_link_libraries("test_2p2c" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_2p2c"
diff --git a/test/boxmodels/2p2cni/CMakeLists.txt b/test/boxmodels/2p2cni/CMakeLists.txt
index b88b7db7f33eff1d8b7c483ca01e535ce72c01fa..b5688689eb7927590e245726ad5a81aa7fbd9196 100644
--- a/test/boxmodels/2p2cni/CMakeLists.txt
+++ b/test/boxmodels/2p2cni/CMakeLists.txt
@@ -1,10 +1,10 @@
 # build target for the 2p2cni test problem
-ADD_EXECUTABLE("test_2p2cni" test_2p2cni.cc)
-TARGET_LINK_LIBRARIES("test_2p2cni" ${DumuxLinkLibraries})
+add_executable("test_2p2cni" test_2p2cni.cc)
+target_link_libraries("test_2p2cni" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_2p2cni"
diff --git a/test/boxmodels/2pni/CMakeLists.txt b/test/boxmodels/2pni/CMakeLists.txt
index 570cc328a0703e0e0c8f3a6d3078dac93815613c..3eaf1d5ab28744454534bc0f934f010053eec529 100644
--- a/test/boxmodels/2pni/CMakeLists.txt
+++ b/test/boxmodels/2pni/CMakeLists.txt
@@ -1,9 +1,9 @@
-ADD_EXECUTABLE("test_2pni" test_2pni.cc)
-TARGET_LINK_LIBRARIES("test_2pni" ${DumuxLinkLibraries})
+add_executable("test_2pni" test_2pni.cc)
+target_link_libraries("test_2pni" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 
 # make sure the grids are present in the build directory
diff --git a/test/boxmodels/3p3c/CMakeLists.txt b/test/boxmodels/3p3c/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b2e5151a1544ef6e0c586171e53901ca4819e3df
--- /dev/null
+++ b/test/boxmodels/3p3c/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_executable("test_3p3c" test_3p3c.cc)
+target_link_libraries("test_3p3c" ${DumuxLinkLibraries})
+
+# add required libraries and includes to the build flags 
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
+
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_3p3c"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")
diff --git a/test/boxmodels/3p3cni/CMakeLists.txt b/test/boxmodels/3p3cni/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dbab39b433c9a3170e59bdb8f30ce9efd5f8ea88
--- /dev/null
+++ b/test/boxmodels/3p3cni/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_executable("test_3p3cni" test_3p3cni.cc)
+target_link_libraries("test_3p3cni" ${DumuxLinkLibraries})
+
+# add required libraries and includes to the build flags 
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
+
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_3p3cni"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")
diff --git a/test/boxmodels/CMakeLists.txt b/test/boxmodels/CMakeLists.txt
index 8a81339afe5952ee446a7c70eeeda34725379fae..c6aa7ba14a63a60e4e6b22bc5f1e596fcfb08bf5 100644
--- a/test/boxmodels/CMakeLists.txt
+++ b/test/boxmodels/CMakeLists.txt
@@ -1,12 +1,10 @@
-# directories which are commented out do not compile at the moment
-# (they also don't compile if using the old build system)!
-
 add_subdirectory("1p")
 add_subdirectory("1p2c")
 add_subdirectory("2p")
-add_subdirectory("2pni")
 add_subdirectory("2p2c")
 add_subdirectory("2p2cni")
+add_subdirectory("2pni")
+add_subdirectory("3p3c")
+add_subdirectory("3p3cni")
 add_subdirectory("MpNc")
 add_subdirectory("richards")
-
diff --git a/test/boxmodels/MpNc/CMakeLists.txt b/test/boxmodels/MpNc/CMakeLists.txt
index 33a2253f3698fc304152af85462683b3137c8226..6e1816337ac66f78325cb54c8f6e3d7d2ac5286e 100644
--- a/test/boxmodels/MpNc/CMakeLists.txt
+++ b/test/boxmodels/MpNc/CMakeLists.txt
@@ -1,10 +1,10 @@
 # build target for the twophase-twocomponent test problem
-ADD_EXECUTABLE("test_MpNc" test_MpNc.cc)
-TARGET_LINK_LIBRARIES("test_MpNc" ${DumuxLinkLibraries})
+add_executable("test_MpNc" test_MpNc.cc)
+target_link_libraries("test_MpNc" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_MpNc"
diff --git a/test/boxmodels/richards/CMakeLists.txt b/test/boxmodels/richards/CMakeLists.txt
index b8c343660bacab56da4a9a83698f45e3c2d33619..ed69d1cd6d8124b11463d29b484ea764e9a9fd76 100644
--- a/test/boxmodels/richards/CMakeLists.txt
+++ b/test/boxmodels/richards/CMakeLists.txt
@@ -4,12 +4,12 @@ if (MPI_FOUND)
 endif (MPI_FOUND)
 
 # build target for the twophase-twocomponent test problem
-ADD_EXECUTABLE("test_richards" test_richards.cc)
-TARGET_LINK_LIBRARIES("test_richards" ${DumuxLinkLibraries})
+add_executable("test_richards" test_richards.cc)
+target_link_libraries("test_richards" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_richards"
diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
index 733a9f761ec00ce4bda0ae5155517112157ac049..e1d3eb19eb9af2d129a3e98029bfcc4e3d346431 100644
--- a/test/common/CMakeLists.txt
+++ b/test/common/CMakeLists.txt
@@ -1,7 +1,3 @@
-# directories which are commented out do not compile at the moment
-# (they also don't compile if using the old build system)!
-
 add_subdirectory("generalproblem")
 add_subdirectory("propertysystem")
 add_subdirectory("spline")
-
diff --git a/test/common/generalproblem/CMakeLists.txt b/test/common/generalproblem/CMakeLists.txt
index eba8b4ff181d5dd88d7d4e07dd84818e4f1fe365..49769d214270387eb71f73a903210dfbc63c723e 100644
--- a/test/common/generalproblem/CMakeLists.txt
+++ b/test/common/generalproblem/CMakeLists.txt
@@ -1,7 +1,7 @@
 # build target for the simple twophase lens problem in a general definition for both box and decoupled model
-ADD_EXECUTABLE("test_generalproblem_2p" test_generalproblem_2p.cc)
-TARGET_LINK_LIBRARIES("test_generalproblem_2p" ${DumuxLinkLibraries})
+add_executable("test_generalproblem_2p" test_generalproblem_2p.cc)
+target_link_libraries("test_generalproblem_2p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
diff --git a/test/common/propertysystem/CMakeLists.txt b/test/common/propertysystem/CMakeLists.txt
index 80690b72d65937fc45298370a93ae9b926098558..566a2255683e6592fca095b3a7dd2e6d89b553d8 100644
--- a/test/common/propertysystem/CMakeLists.txt
+++ b/test/common/propertysystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 # build the test for the property system
-ADD_EXECUTABLE("test_propertysystem" test_propertysystem.cc)
+add_executable("test_propertysystem" test_propertysystem.cc)
 
 # add required libraries and includes to the build flags 
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+include_directories(${DumuxIncludeDirectories})
diff --git a/test/common/spline/CMakeLists.txt b/test/common/spline/CMakeLists.txt
index 299346f1002d34f689003de56bc86f9f1f4f021c..cbd328f44067dac24651064d8714e5a7b06008cf 100644
--- a/test/common/spline/CMakeLists.txt
+++ b/test/common/spline/CMakeLists.txt
@@ -1,8 +1,8 @@
 # add build targets
-ADD_EXECUTABLE("test_spline" test_spline.cc)
-TARGET_LINK_LIBRARIES("test_spline" ${DumuxLinkLibraries})
+add_executable("test_spline" test_spline.cc)
+target_link_libraries("test_spline" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
diff --git a/test/decoupled/1p/CMakeLists.txt b/test/decoupled/1p/CMakeLists.txt
index 552690a6cd8c62c8b69454adef2fcd57722b56bf..4c09fe49dd5992114ae8351f977dce9de676569e 100644
--- a/test/decoupled/1p/CMakeLists.txt
+++ b/test/decoupled/1p/CMakeLists.txt
@@ -1,13 +1,13 @@
 # add build targets
-ADD_EXECUTABLE("test_diffusion" test_diffusion.cc)
-TARGET_LINK_LIBRARIES("test_diffusion" ${DumuxLinkLibraries})
+add_executable("test_diffusion" test_diffusion.cc)
+target_link_libraries("test_diffusion" ${DumuxLinkLibraries})
 
-ADD_EXECUTABLE("test_dec1p" test_1p.cc)
-TARGET_LINK_LIBRARIES("test_dec1p" ${DumuxLinkLibraries})
+add_executable("test_dec1p" test_1p.cc)
+target_link_libraries("test_dec1p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_diffusion"
diff --git a/test/decoupled/2p/CMakeLists.txt b/test/decoupled/2p/CMakeLists.txt
index 730971ddca122a54732764b5e08d63c32da7571c..32a0c25b847141f88b19d16db4962a6a7d556340 100644
--- a/test/decoupled/2p/CMakeLists.txt
+++ b/test/decoupled/2p/CMakeLists.txt
@@ -1,13 +1,13 @@
 # add build targets
 ADD_EXECUTABLE("test_impes" test_impes.cc)
-TARGET_LINK_LIBRARIES("test_impes" ${DumuxLinkLibraries})
+target_link_libraries("test_impes" ${DumuxLinkLibraries})
 
-ADD_EXECUTABLE("test_transport" test_transport.cc)
-TARGET_LINK_LIBRARIES("test_transport" ${DumuxLinkLibraries})
+add_executable("test_transport" test_transport.cc)
+target_link_libraries("test_transport" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_transport"
diff --git a/test/decoupled/2p2c/CMakeLists.txt b/test/decoupled/2p2c/CMakeLists.txt
index a4f1aabd8e9c07c078046a54d948071209d2e1ac..96c1f724e08247c99a8cb307fa76b2d2de3de731 100644
--- a/test/decoupled/2p2c/CMakeLists.txt
+++ b/test/decoupled/2p2c/CMakeLists.txt
@@ -1,10 +1,10 @@
 # add build targets
-ADD_EXECUTABLE("test_dec2p2c" test_dec2p2c.cc)
-TARGET_LINK_LIBRARIES("test_dec2p2c" ${DumuxLinkLibraries})
+add_executable("test_dec2p2c" test_dec2p2c.cc)
+target_link_libraries("test_dec2p2c" ${DumuxLinkLibraries})
 
-ADD_EXECUTABLE("test_multiphysics2p2c" test_multiphysics2p2c.cc)
-TARGET_LINK_LIBRARIES("test_multiphysics2p2c" ${DumuxLinkLibraries})
+add_executable("test_multiphysics2p2c" test_multiphysics2p2c.cc)
+target_link_libraries("test_multiphysics2p2c" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
diff --git a/test/decoupled/2padaptive/CMakeLists.txt b/test/decoupled/2padaptive/CMakeLists.txt
index 1983f9041f85ac285555dea8b6db1ee107b31883..3ad6412d683490320928de9910451bc8b8aff102 100644
--- a/test/decoupled/2padaptive/CMakeLists.txt
+++ b/test/decoupled/2padaptive/CMakeLists.txt
@@ -1,15 +1,15 @@
 add_definitions(-DYASPGRID -DGRIDDIM=2 -DENABLE_UG)
 
 # add build targets
-ADD_EXECUTABLE("test_impes_adaptive" test_impes.cc)
-TARGET_LINK_LIBRARIES("test_impes_adaptive" ${DumuxLinkLibraries})
+add_executable("test_impes_adaptive" test_impes_adaptive.cc)
+target_link_libraries("test_impes_adaptive" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
-add_custom_command(TARGET "test_transport"
+add_custom_command(TARGET "test_impes_adaptive"
                    POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E
                         copy_directory 
diff --git a/test/decoupled/CMakeLists.txt b/test/decoupled/CMakeLists.txt
index 0c9cc63bd4d5adc572327f0b0c8669ef1ba3b815..ef8fbcc3a94c0151e7c9137f127ab37263fc136b 100644
--- a/test/decoupled/CMakeLists.txt
+++ b/test/decoupled/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory("1p")
 add_subdirectory("2p")
 add_subdirectory("2p2c")
-
+add_subdirectory("2padaptive")
diff --git a/test/freeflow/CMakeLists.txt b/test/freeflow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..951fe6368871cf19e6dba2c650d5932dd07124e0
--- /dev/null
+++ b/test/freeflow/CMakeLists.txt
@@ -0,0 +1,3 @@
+#add_subdirectory("stokes")
+#add_subdirectory("stokes2c")
+#add_subdirectory("stokes2cni")
diff --git a/test/freeflow/stokes/CMakeLists.txt b/test/freeflow/stokes/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b0c42a4bdb3a25805f1947a1e565de0e8636c961
--- /dev/null
+++ b/test/freeflow/stokes/CMakeLists.txt
@@ -0,0 +1,11 @@
+# add build targets
+add_executable("test_stokes" test_stokes.cc)
+target_link_libraries("test_stokes" ${DumuxLinkLibraries})
+set_target_properties("test_stokes"
+  PROPERTIES
+  COMPILE_FLAGS ${SUPERLU_CPPFLAGS}
+  LINK_FLAGS ${SUPERLU_LIBS})
+
+# add required libraries and includes to the build flags
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories}) 
\ No newline at end of file
diff --git a/test/freeflow/stokes2c/CMakeLists.txt b/test/freeflow/stokes2c/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..000d67bc44a7765c8c52ec65ca762c965b70df37
--- /dev/null
+++ b/test/freeflow/stokes2c/CMakeLists.txt
@@ -0,0 +1,10 @@
+# add build targets
+add_executable("test_stokes2c" test_stokes2c.cc)
+target_link_libraries("test_stokes2c" ${DumuxLinkLibraries})
+set_target_properties("test_stokes2c"
+  PROPERTIES
+  COMPILE_FLAGS ${SUPERLU_CPPFLAGS})
+
+# add required libraries and includes to the build flags
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories}) 
\ No newline at end of file
diff --git a/test/freeflow/stokes2cni/CMakeLists.txt b/test/freeflow/stokes2cni/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b91dac3e990a7a73ff813062769e28ed8bca3fd7
--- /dev/null
+++ b/test/freeflow/stokes2cni/CMakeLists.txt
@@ -0,0 +1,10 @@
+# add build targets
+add_executable("test_stokes2cni" test_stokes2cni.cc)
+target_link_libraries("test_stokes2cni" ${DumuxLinkLibraries})
+set_target_properties("test_stokes2cni"
+  PROPERTIES
+  COMPILE_FLAGS ${SUPERLU_CPPFLAGS})
+
+# add required libraries and includes to the build flags
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories}) 
\ No newline at end of file
diff --git a/test/material/CMakeLists.txt b/test/material/CMakeLists.txt
index 3ec7713510173014cc149f83e0e5f21339664b9b..4edc997072d5796af9cbecda29a7e18f03aaebfd 100644
--- a/test/material/CMakeLists.txt
+++ b/test/material/CMakeLists.txt
@@ -1,6 +1,3 @@
-# directories which are commented out do not compile at the moment
-# (they also don't compile if using the old build system)!
-
 add_subdirectory("fluidsystems")
 add_subdirectory("immiscibleflash")
 add_subdirectory("ncpflash")
diff --git a/test/material/fluidsystems/CMakeLists.txt b/test/material/fluidsystems/CMakeLists.txt
index 054fc68cad3c147ef6f3dd68d01f9d84cfcc8d8a..56b346bf81ab09392e143198f0dd17d0b47b1a51 100644
--- a/test/material/fluidsystems/CMakeLists.txt
+++ b/test/material/fluidsystems/CMakeLists.txt
@@ -1,8 +1,8 @@
 # build target for the simple twophase lens problem
-ADD_EXECUTABLE("test_fluidsystems" test_fluidsystems.cc)
-TARGET_LINK_LIBRARIES("test_fluidsystems" ${DumuxLinkLibraries})
+add_executable("test_fluidsystems" test_fluidsystems.cc)
+target_link_libraries("test_fluidsystems" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
diff --git a/test/material/immiscibleflash/CMakeLists.txt b/test/material/immiscibleflash/CMakeLists.txt
index 9b71248199512f4edf18e7cf4485c41a79b5399b..0bb21dc32ef686a9cdb1638ff7d25992a1ce0a6a 100644
--- a/test/material/immiscibleflash/CMakeLists.txt
+++ b/test/material/immiscibleflash/CMakeLists.txt
@@ -1,8 +1,8 @@
 # build target for the simple twophase lens problem
-ADD_EXECUTABLE("test_immiscibleflash" test_immiscibleflash.cc)
-TARGET_LINK_LIBRARIES("test_immiscibleflash" ${DumuxLinkLibraries})
+add_executable("test_immiscibleflash" test_immiscibleflash.cc)
+target_link_libraries("test_immiscibleflash" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
diff --git a/test/material/ncpflash/CMakeLists.txt b/test/material/ncpflash/CMakeLists.txt
index 6df5a763b390396698536d2948c5152baeb4287f..b4ff06054da5aa44a4f92fcfdd93eb0d71875c5e 100644
--- a/test/material/ncpflash/CMakeLists.txt
+++ b/test/material/ncpflash/CMakeLists.txt
@@ -1,8 +1,8 @@
 # build target for the simple twophase lens problem
-ADD_EXECUTABLE("test_ncpflash" test_ncpflash.cc)
-TARGET_LINK_LIBRARIES("test_ncpflash" ${DumuxLinkLibraries})
+add_executable("test_ncpflash" test_ncpflash.cc)
+target_link_libraries("test_ncpflash" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
diff --git a/test/material/pengrobinson/CMakeLists.txt b/test/material/pengrobinson/CMakeLists.txt
index fb1a38c3ac4e75e4ca6bf88a9ee843e65e65f427..e9055f2f75f5669fc651b6eed86de674abc83e41 100644
--- a/test/material/pengrobinson/CMakeLists.txt
+++ b/test/material/pengrobinson/CMakeLists.txt
@@ -1,8 +1,8 @@
 # build target for the simple twophase lens problem
-ADD_EXECUTABLE("test_pengrobinson" test_pengrobinson.cc)
-TARGET_LINK_LIBRARIES("test_pengrobinson" ${DumuxLinkLibraries})
+add_executable("test_pengrobinson" test_pengrobinson.cc)
+target_link_libraries("test_pengrobinson" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
diff --git a/test/material/tabulation/CMakeLists.txt b/test/material/tabulation/CMakeLists.txt
index e4a35783b1525644f1665145ee47fd48ecd9e2c4..2a3edae0ec271a26512bb66f582bc39867cd0b01 100644
--- a/test/material/tabulation/CMakeLists.txt
+++ b/test/material/tabulation/CMakeLists.txt
@@ -1,8 +1,8 @@
 # build target for the simple twophase lens problem
-ADD_EXECUTABLE("test_tabulation" test_tabulation.cc)
-TARGET_LINK_LIBRARIES("test_tabulation" ${DumuxLinkLibraries})
+add_executable("test_tabulation" test_tabulation.cc)
+target_link_libraries("test_tabulation" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})