diff --git a/CMakeLists.txt b/CMakeLists.txt
index e80fac121fb91b7b7f839a1dc53f0917f1c1adf9..2018bba83b21a2c86d1a728348923c41078ed811 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,7 +201,15 @@ file(COPY test/decoupled/2p2c/test_dec2p2c-reference.vtu DESTINATION test/decoup
# set up CTest
ENABLE_TESTING()
INCLUDE(CTest)
-ADD_TEST(test_1p util/runTest.sh test/boxmodels/1p/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p test/boxmodels/1p/grids/test_1p_2d.dgf 1 1)
+add_test(test_propertysystem test/common/propertysystem/test_propertysystem)
+add_test(test_generalproblem test/common/generalproblem/test_generalproblem_2p)
+add_test(test_spline test/common/spline/test_spline)
+
+add_test(test_fluidsystems test/material/fluidsystems/test_fluidsystems)
+add_test(test_ncpflash test/material/ncpflash/test_ncpflash)
+add_test(test_tabulation test/material/tabulation/test_tabulation)
+
+add_test(test_1p util/runTest.sh test/boxmodels/1p/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p test/boxmodels/1p/grids/test_1p_2d.dgf 1 1)
add_test(test_1p2c util/runTest.sh test/boxmodels/1p2c/tissue-reference.vtu tissue-00003.vtu test/boxmodels/1p2c/test_1p2c test/boxmodels/1p2c/grids/test_1p2c.dgf 2e3 1e3)
add_test(test_2p util/runTest.sh test/boxmodels/2p/lens-reference.vtu lens-00010.vtu test/boxmodels/2p/test_2p 3000 250)
add_test(test_2pni util/runTest.sh test/boxmodels/2pni/injection2pni-reference.vtu injection2pni-00009.vtu test/boxmodels/2pni/test_2pni test/boxmodels/2pni/grids/test_2pni.dgf 1e4 250)
@@ -209,15 +217,13 @@ add_test(test_2p2c util/runTest.sh test/boxmodels/2p2c/injection-reference.vtu i
add_test(test_2p2cni util/runTest.sh test/boxmodels/2p2cni/waterair-reference.vtu waterair-00011.vtu test/boxmodels/2p2cni/test_2p2cni test/boxmodels/2p2cni/grids/test_2p2cni.dgf 1e4 250)
add_test(test_MpNc util/runTest.sh test/boxmodels/MpNc/obstacle-reference.vtu obstacle-00011.vtu test/boxmodels/MpNc/test_MpNc test/boxmodels/MpNc/grids/obstacle_24x16.dgf 1e4 250)
add_test(test_richards util/runTest.sh test/boxmodels/richards/richardslens-reference.vtu richardslens-00009.vtu test/boxmodels/richards/test_richards test/boxmodels/richards/grids/richardslens.dgf 100 10)
-add_test(test_propertysystem test/common/propertysystem/test_propertysystem)
-add_test(test_spline test/common/spline/test_spline)
+
add_test(test_diffusion util/runTest.sh test/decoupled/1p/diffusion-reference.vtu mimeticdiffusion-00001.vtu test/decoupled/1p/test_diffusion 3)
add_test(test_dec1p util/runTest.sh test/decoupled/1p/test_1p-reference.vtu test_1p-00001.vtu test/decoupled/1p/test_dec1p 3)
add_test(test_transport util/runTest.sh test/decoupled/2p/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport test/decoupled/2p/grids/test_transport.dgf 1e4)
add_test(test_impes util/runTest.sh test/decoupled/2p/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes 1e7)
add_test(test_dec2p2c util/runTest.sh test/decoupled/2p2c/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c)
-add_test(test_fluidsystems test/material/fluidsystems/test_fluidsystems)
-add_test(test_fluidsystems test/material/ncpflash/test_ncpflash)
+
add_test(tutorial_coupled tutorial/tutorial_coupled 1 1)
add_test(tutorial_decoupled tutorial/tutorial_decoupled 1)
diff --git a/test/common/generalproblem/CMakeLists.txt b/test/common/generalproblem/CMakeLists.txt
index 16728c1f53cd90c94e8a66616ea3f37effcdc8a7..6b6c4a4e3d35c28d4a6fcfa2433283c18ded34b6 100644
--- a/test/common/generalproblem/CMakeLists.txt
+++ b/test/common/generalproblem/CMakeLists.txt
@@ -2,17 +2,8 @@ add_definitions(-DYASPGRID -DGRIDDIM=2 -DENABLE_UG)
# 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_2p" ${DumuxLinkLibraries})
+TARGET_LINK_LIBRARIES("test_generalproblem_2p" ${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_generalproblem_2p"
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E
- copy_directory
- "${CMAKE_CURRENT_SOURCE_DIR}/grids"
- "${CMAKE_CURRENT_BINARY_DIR}/grids")
-
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 3b4110b9afe0fec0558a3e1d517c17ecff5d1d68..06fb71e4df062536071cc9c618f99f0a80021985 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -36,7 +36,6 @@
#include <dumux/material/fluidsystems/1pfluidsystem.hh>
#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
-#include <appl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh>
// include all fluid states
#include <dumux/material/fluidstates/pressureoverlayfluidstate.hh>
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index 3f4a30b9abb592fe25a47bac94bfc989e8982e56..368b9d9bb0c9e90ee3bc63e895eab7d9970abed6 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -38,7 +38,6 @@
#include <dumux/material/fluidsystems/1pfluidsystem.hh>
#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
-#include <appl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh>
// include all fluid states
#include <dumux/material/fluidstates/pressureoverlayfluidstate.hh>
@@ -113,10 +112,6 @@ int main()
{ typedef Dumux::FluidSystems::OneP<Scalar, Gas> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); }
- // water -- contaminant
- { typedef Dumux::FluidSystems::WaterContaminant<Scalar> FluidSystem;
- checkFluidSystem<Scalar, FluidSystem>(); }
-
// interstitial fluid -- TRAIL
{ typedef Dumux::FluidSystems::InterstitialFluidTrail<Scalar> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); }
diff --git a/test/material/tabulation/test_tabulation.cc b/test/material/tabulation/test_tabulation.cc
index 819630febdf04bc32f64f8a847ef743e450faf06..2f2b53bad2e22756ba8586f155b2834584a6e806 100644
--- a/test/material/tabulation/test_tabulation.cc
+++ b/test/material/tabulation/test_tabulation.cc
@@ -53,7 +53,7 @@ int main()
Scalar tempMin = 274.15;
Scalar tempMax = 622.15;
- int nTemp = (int) (tempMax - tempMin)*3/4;
+ int nTemp = (int) (tempMax - tempMin)*3/8;
Scalar pMin = 10.00;
Scalar pMax = IapwsH2O::vaporPressure(tempMax*1.1);