diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1acb2cd061fe82cccf288fd92d32f3fca27d1fa..82025a83eed4fc2a43b9de3a1b918eea9902a461 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -408,7 +408,7 @@ add_test(test_richards bin/runTest.sh references/richardslens-reference.vtu  ric
 add_test(test_diffusion bin/runTest.sh references/diffusion-reference.vtu      mimeticdiffusion-00001.vtu test/decoupled/1p/test_diffusion 3)
 add_test(test_dec1p     bin/runTest.sh references/test_1p-reference.vtu        test_1p-00001.vtu          test/decoupled/1p/test_dec1p --parameter-file=test/decoupled/1p/test_1p.input)
 add_test(test_transport bin/runTest.sh references/test_transport-reference.vtu test_transport-00006.vtu   test/decoupled/2p/test_transport --parameter-file=parameters/test_transport.input -gridFile test/decoupled/2p/grids/test_transport.dgf)
-add_test(test_impes     bin/runTest.sh references/test_impes-reference.vtu     test_impes-00013.vtu       test/decoupled/2p/test_impes     --parameter-file=parameters/test_impes.input)
+add_test(test_impes     bin/runTest.sh references/test_impes-reference.vtu     test_impes-00050.vtu       test/decoupled/2p/test_impes     --parameter-file=parameters/test_impes.input)
 add_test(test_impes_adaptive     bin/runTest.sh references/output2padaptive-reference.vtu output2padaptive-00007.vtu      test/decoupled/2padaptive/test_impes_adaptive  parameters/input)
 add_test(test_dec2p2c   bin/runTest.sh references/test_dec2p2c-reference.vtu   test_dec2p2c-00021.vtu     test/decoupled/2p2c/test_dec2p2c --parameter-file=parameters/test_dec2p2c.input)
 add_test(test_multiphysics2p2c   bin/runTest.sh references/test_multiphysics2p2c-reference.vtu   test_multiphysics2p2c-00021.vtu     test/decoupled/2p2c/test_multiphysics2p2c)
diff --git a/test/decoupled/2p/test_impes-reference.vtu b/test/decoupled/2p/test_impes-reference.vtu
deleted file mode 100644
index 4f081ea165e336507e20de78ef81e248aa516e78..0000000000000000000000000000000000000000
--- a/test/decoupled/2p/test_impes-reference.vtu
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0"?>
-<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
-  <UnstructuredGrid>
-    <Piece NumberOfCells="180" NumberOfPoints="217">
-      <CellData Scalars="wetting pressure" Vectors="wetting-velocity">
-        <DataArray type="Float32" Name="wetting pressure" NumberOfComponents="1" format="ascii">
-          200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 200000 200000 200000 200000 200000 200000
-          200000 200000 200000 200000 200000 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 200000 200000 200000 200000 200000 200000
-          200000 200000 200000 200000 200000 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 200000 200000 200000 200000 200000 200000
-          200000 200000 200000 200000 200000 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-        </DataArray>
-        <DataArray type="Float32" Name="nonwetting pressure" NumberOfComponents="1" format="ascii">
-          200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 200000 200000 200000 200000 200000 200000
-          200000 200000 200000 200000 200000 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 200000 200000 200000 200000 200000 200000
-          200000 200000 200000 200000 200000 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 200000 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 200000 200000 200000 200000 200000 200000
-          200000 200000 200000 200000 200000 199999 199999 199999 199999 199999 199999 199999
-          199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999 199999
-        </DataArray>
-        <DataArray type="Float32" Name="capillary pressure" NumberOfComponents="1" format="ascii">
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-        </DataArray>
-        <DataArray type="Float32" Name="wetting saturation" NumberOfComponents="1" format="ascii">
-          0.743888 0.661224 0.593957 0.300918 0.200013 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.743888 0.661224 0.593957 0.300918 0.200013 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.743888 0.661224 0.593957 0.300918 0.200013 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.743888 0.661224 0.593957 0.300918 0.200013 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.743888 0.661224 0.593957 0.300918 0.200013 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.743888 0.661224 0.593957 0.300918 0.200013 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-        </DataArray>
-        <DataArray type="Float32" Name="nonwetting saturation" NumberOfComponents="1" format="ascii">
-          0.256112 0.338776 0.406043 0.699082 0.799987 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.256112 0.338776 0.406043 0.699082 0.799987 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.256112 0.338776 0.406043 0.699082 0.799987 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.256112 0.338776 0.406043 0.699082 0.799987 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.256112 0.338776 0.406043 0.699082 0.799987 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.256112 0.338776 0.406043 0.699082 0.799987 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-          0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8 0.8
-        </DataArray>
-        <DataArray type="Float32" Name="wetting-velocity" NumberOfComponents="3" format="ascii">
-          2.99652e-07 2.94559e-16 0 2.90182e-07 9.94515e-17 0 2.43301e-07 0 0 1.02814e-07 1.27126e-19 0
-          4.30793e-11 0 0 2.78216e-30 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 2.99652e-07 -2.94558e-16 0 2.90182e-07 4.47532e-16 0
-          2.43301e-07 2.6764e-16 0 1.02814e-07 2.54252e-19 0 4.30793e-11 0 0 2.78215e-30 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          2.99652e-07 -3.92745e-16 0 2.90182e-07 1.49177e-16 0 2.43301e-07 1.21655e-16 0 1.02814e-07 -1.58907e-19 0
-          4.30793e-11 0 0 2.78215e-30 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 2.99652e-07 3.92745e-16 0 2.90182e-07 -1.49177e-16 0
-          2.43301e-07 -9.73237e-17 0 1.02814e-07 -2.54252e-19 0 4.30793e-11 0 0 2.78215e-30 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          2.99652e-07 -3.92745e-16 0 2.90182e-07 7.45886e-16 0 2.43301e-07 2.18978e-16 0 1.02814e-07 5.40285e-19 0
-          4.30793e-11 0 0 2.78216e-30 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 2.99652e-07 -5.89117e-16 0 2.90182e-07 6.96161e-16 0
-          2.43301e-07 1.70316e-16 0 1.02814e-07 5.08504e-19 0 4.30793e-11 0 0 2.78215e-30 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0 0 0 0 0 0 0 0 0
-        </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
-          3.47586e-10 6.84148e-19 0 9.81759e-09 6.70181e-18 0 5.66992e-08 0 0 1.97186e-07 4.42519e-16 0
-          2.99957e-07 -1.45519e-16 0 3e-07 -4.36557e-16 0 3e-07 -4.36557e-16 0 3e-07 2.91038e-16 0
-          3e-07 2.91038e-16 0 3e-07 -1.45519e-16 0 3e-07 2.91038e-16 0 3e-07 1.45519e-16 0
-          3e-07 2.91038e-16 0 3e-07 -1.45519e-16 0 3e-07 -5.82077e-16 0 3e-07 -5.82077e-16 0
-          3e-07 1.45519e-16 0 3e-07 -1.45519e-16 0 3e-07 -1.45519e-16 0 3e-07 2.91038e-16 0
-          3e-07 -1.45519e-16 0 3e-07 -1.45519e-16 0 3e-07 0 0 3e-07 2.91038e-16 0
-          3e-07 4.36557e-16 0 3e-07 8.73115e-16 0 3e-07 1.45519e-16 0 3e-07 -5.82077e-16 0
-          3e-07 -4.36557e-16 0 3e-07 5.82077e-16 0 3.47586e-10 -6.84148e-19 0 9.81759e-09 3.01582e-17 0
-          5.66992e-08 1.22996e-16 0 1.97186e-07 8.85038e-16 0 2.99957e-07 -1.45519e-16 0 3e-07 -7.27596e-16 0
-          3e-07 -1.45519e-16 0 3e-07 5.82077e-16 0 3e-07 -1.45519e-16 0 3e-07 4.36557e-16 0
-          3e-07 4.36557e-16 0 3e-07 -1.45519e-16 0 3e-07 4.36557e-16 0 3e-07 1.45519e-16 0
-          3e-07 -5.82077e-16 0 3e-07 -5.82077e-16 0 3e-07 1.45519e-16 0 3e-07 5.82077e-16 0
-          3e-07 -1.45519e-16 0 3e-07 -4.36557e-16 0 3e-07 -2.91038e-16 0 3e-07 -2.91038e-16 0
-          3e-07 1.01863e-15 0 3e-07 2.91038e-16 0 3e-07 2.91038e-16 0 3e-07 1.45519e-16 0
-          3e-07 -1.45519e-16 0 3e-07 -4.36557e-16 0 3e-07 -1.45519e-16 0 3e-07 4.36557e-16 0
-          3.47586e-10 -9.12197e-19 0 9.81759e-09 1.00527e-17 0 5.66992e-08 5.59075e-17 0 1.97186e-07 -5.53149e-16 0
-          2.99957e-07 0 0 3e-07 -2.91038e-16 0 3e-07 1.45519e-16 0 3e-07 1.45519e-16 0
-          3e-07 -1.45519e-16 0 3e-07 4.36557e-16 0 3e-07 0 0 3e-07 0 0
-          3e-07 4.36557e-16 0 3e-07 -1.45519e-16 0 3e-07 -1.45519e-16 0 3e-07 1.45519e-16 0
-          3e-07 -2.91038e-16 0 3e-07 7.27596e-16 0 3e-07 -4.36557e-16 0 3e-07 -2.91038e-16 0
-          3e-07 1.45519e-16 0 3e-07 -5.82077e-16 0 3e-07 -1.45519e-16 0 3e-07 1.45519e-16 0
-          3e-07 -2.91038e-16 0 3e-07 -5.82077e-16 0 3e-07 1.45519e-16 0 3e-07 4.36557e-16 0
-          3e-07 0 0 3e-07 -5.82077e-16 0 3.47586e-10 9.12197e-19 0 9.81759e-09 -1.00527e-17 0
-          5.66992e-08 -4.4726e-17 0 1.97186e-07 -8.85038e-16 0 2.99957e-07 4.36556e-16 0 3e-07 5.82077e-16 0
-          3e-07 -2.91038e-16 0 3e-07 -4.36557e-16 0 3e-07 1.45519e-16 0 3e-07 0 0
-          3e-07 -1.45519e-16 0 3e-07 2.91038e-16 0 3e-07 -1.45519e-16 0 3e-07 -1.45519e-16 0
-          3e-07 -2.91038e-16 0 3e-07 0 0 3e-07 2.91038e-16 0 3e-07 -2.91038e-16 0
-          3e-07 0 0 3e-07 4.36557e-16 0 3e-07 -4.36557e-16 0 3e-07 -1.01863e-15 0
-          3e-07 -1.45519e-15 0 3e-07 -2.91038e-16 0 3e-07 2.91038e-16 0 3e-07 0 0
-          3e-07 4.36557e-16 0 3e-07 5.82077e-16 0 3e-07 -2.91038e-16 0 3e-07 -1.45519e-16 0
-          3.47586e-10 -9.12197e-19 0 9.81759e-09 5.02636e-17 0 5.66992e-08 1.00633e-16 0 1.97186e-07 1.88071e-15 0
-          2.99957e-07 -1.45519e-16 0 3e-07 2.91038e-16 0 3e-07 -5.82077e-16 0 3e-07 2.91038e-16 0
-          3e-07 0 0 3e-07 -2.91038e-16 0 3e-07 0 0 3e-07 1.45519e-16 0
-          3e-07 -4.36557e-16 0 3e-07 0 0 3e-07 1.45519e-16 0 3e-07 4.36557e-16 0
-          3e-07 4.36557e-16 0 3e-07 -8.73115e-16 0 3e-07 2.91038e-16 0 3e-07 -4.36557e-16 0
-          3e-07 -8.73115e-16 0 3e-07 -2.91038e-16 0 3e-07 2.91038e-16 0 3e-07 -4.36557e-16 0
-          3e-07 -4.36557e-16 0 3e-07 0 0 3e-07 0 0 3e-07 -2.91038e-16 0
-          3e-07 4.36557e-16 0 3e-07 5.82077e-16 0 3.47586e-10 -1.3683e-18 0 9.81759e-09 4.69127e-17 0
-          5.66992e-08 7.82705e-17 0 1.97186e-07 1.77008e-15 0 2.99957e-07 -5.82074e-16 0 3e-07 -2.91038e-16 0
-          3e-07 -4.36557e-16 0 3e-07 5.82077e-16 0 3e-07 1.45519e-16 0 3e-07 -4.36557e-16 0
-          3e-07 0 0 3e-07 1.45519e-16 0 3e-07 0 0 3e-07 -2.91038e-16 0
-          3e-07 2.91038e-16 0 3e-07 5.82077e-16 0 3e-07 -1.45519e-16 0 3e-07 -5.82077e-16 0
-          3e-07 -1.45519e-16 0 3e-07 -4.36557e-16 0 3e-07 -1.45519e-16 0 3e-07 2.91038e-16 0
-          3e-07 5.82077e-16 0 3e-07 0 0 3e-07 -8.73115e-16 0 3e-07 1.45519e-16 0
-          3e-07 0 0 3e-07 -5.82077e-16 0 3e-07 4.36557e-16 0 3e-07 2.91038e-16 0
-        </DataArray>
-      </CellData>
-      <Points>
-        <DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii">
-          0 0 0 10 0 0 0 10 0 10 10 0
-          20 0 0 20 10 0 30 0 0 30 10 0
-          40 0 0 40 10 0 50 0 0 50 10 0
-          60 0 0 60 10 0 70 0 0 70 10 0
-          80 0 0 80 10 0 90 0 0 90 10 0
-          100 0 0 100 10 0 110 0 0 110 10 0
-          120 0 0 120 10 0 130 0 0 130 10 0
-          140 0 0 140 10 0 150 0 0 150 10 0
-          160 0 0 160 10 0 170 0 0 170 10 0
-          180 0 0 180 10 0 190 0 0 190 10 0
-          200 0 0 200 10 0 210 0 0 210 10 0
-          220 0 0 220 10 0 230 0 0 230 10 0
-          240 0 0 240 10 0 250 0 0 250 10 0
-          260 0 0 260 10 0 270 0 0 270 10 0
-          280 0 0 280 10 0 290 0 0 290 10 0
-          300 0 0 300 10 0 0 20 0 10 20 0
-          20 20 0 30 20 0 40 20 0 50 20 0
-          60 20 0 70 20 0 80 20 0 90 20 0
-          100 20 0 110 20 0 120 20 0 130 20 0
-          140 20 0 150 20 0 160 20 0 170 20 0
-          180 20 0 190 20 0 200 20 0 210 20 0
-          220 20 0 230 20 0 240 20 0 250 20 0
-          260 20 0 270 20 0 280 20 0 290 20 0
-          300 20 0 0 30 0 10 30 0 20 30 0
-          30 30 0 40 30 0 50 30 0 60 30 0
-          70 30 0 80 30 0 90 30 0 100 30 0
-          110 30 0 120 30 0 130 30 0 140 30 0
-          150 30 0 160 30 0 170 30 0 180 30 0
-          190 30 0 200 30 0 210 30 0 220 30 0
-          230 30 0 240 30 0 250 30 0 260 30 0
-          270 30 0 280 30 0 290 30 0 300 30 0
-          0 40 0 10 40 0 20 40 0 30 40 0
-          40 40 0 50 40 0 60 40 0 70 40 0
-          80 40 0 90 40 0 100 40 0 110 40 0
-          120 40 0 130 40 0 140 40 0 150 40 0
-          160 40 0 170 40 0 180 40 0 190 40 0
-          200 40 0 210 40 0 220 40 0 230 40 0
-          240 40 0 250 40 0 260 40 0 270 40 0
-          280 40 0 290 40 0 300 40 0 0 50 0
-          10 50 0 20 50 0 30 50 0 40 50 0
-          50 50 0 60 50 0 70 50 0 80 50 0
-          90 50 0 100 50 0 110 50 0 120 50 0
-          130 50 0 140 50 0 150 50 0 160 50 0
-          170 50 0 180 50 0 190 50 0 200 50 0
-          210 50 0 220 50 0 230 50 0 240 50 0
-          250 50 0 260 50 0 270 50 0 280 50 0
-          290 50 0 300 50 0 0 60 0 10 60 0
-          20 60 0 30 60 0 40 60 0 50 60 0
-          60 60 0 70 60 0 80 60 0 90 60 0
-          100 60 0 110 60 0 120 60 0 130 60 0
-          140 60 0 150 60 0 160 60 0 170 60 0
-          180 60 0 190 60 0 200 60 0 210 60 0
-          220 60 0 230 60 0 240 60 0 250 60 0
-          260 60 0 270 60 0 280 60 0 290 60 0
-          300 60 0
-        </DataArray>
-      </Points>
-      <Cells>
-        <DataArray type="Int32" Name="connectivity" NumberOfComponents="1" format="ascii">
-          0 1 3 2 1 4 5 3 4 6 7 5
-          6 8 9 7 8 10 11 9 10 12 13 11
-          12 14 15 13 14 16 17 15 16 18 19 17
-          18 20 21 19 20 22 23 21 22 24 25 23
-          24 26 27 25 26 28 29 27 28 30 31 29
-          30 32 33 31 32 34 35 33 34 36 37 35
-          36 38 39 37 38 40 41 39 40 42 43 41
-          42 44 45 43 44 46 47 45 46 48 49 47
-          48 50 51 49 50 52 53 51 52 54 55 53
-          54 56 57 55 56 58 59 57 58 60 61 59
-          2 3 63 62 3 5 64 63 5 7 65 64
-          7 9 66 65 9 11 67 66 11 13 68 67
-          13 15 69 68 15 17 70 69 17 19 71 70
-          19 21 72 71 21 23 73 72 23 25 74 73
-          25 27 75 74 27 29 76 75 29 31 77 76
-          31 33 78 77 33 35 79 78 35 37 80 79
-          37 39 81 80 39 41 82 81 41 43 83 82
-          43 45 84 83 45 47 85 84 47 49 86 85
-          49 51 87 86 51 53 88 87 53 55 89 88
-          55 57 90 89 57 59 91 90 59 61 92 91
-          62 63 94 93 63 64 95 94 64 65 96 95
-          65 66 97 96 66 67 98 97 67 68 99 98
-          68 69 100 99 69 70 101 100 70 71 102 101
-          71 72 103 102 72 73 104 103 73 74 105 104
-          74 75 106 105 75 76 107 106 76 77 108 107
-          77 78 109 108 78 79 110 109 79 80 111 110
-          80 81 112 111 81 82 113 112 82 83 114 113
-          83 84 115 114 84 85 116 115 85 86 117 116
-          86 87 118 117 87 88 119 118 88 89 120 119
-          89 90 121 120 90 91 122 121 91 92 123 122
-          93 94 125 124 94 95 126 125 95 96 127 126
-          96 97 128 127 97 98 129 128 98 99 130 129
-          99 100 131 130 100 101 132 131 101 102 133 132
-          102 103 134 133 103 104 135 134 104 105 136 135
-          105 106 137 136 106 107 138 137 107 108 139 138
-          108 109 140 139 109 110 141 140 110 111 142 141
-          111 112 143 142 112 113 144 143 113 114 145 144
-          114 115 146 145 115 116 147 146 116 117 148 147
-          117 118 149 148 118 119 150 149 119 120 151 150
-          120 121 152 151 121 122 153 152 122 123 154 153
-          124 125 156 155 125 126 157 156 126 127 158 157
-          127 128 159 158 128 129 160 159 129 130 161 160
-          130 131 162 161 131 132 163 162 132 133 164 163
-          133 134 165 164 134 135 166 165 135 136 167 166
-          136 137 168 167 137 138 169 168 138 139 170 169
-          139 140 171 170 140 141 172 171 141 142 173 172
-          142 143 174 173 143 144 175 174 144 145 176 175
-          145 146 177 176 146 147 178 177 147 148 179 178
-          148 149 180 179 149 150 181 180 150 151 182 181
-          151 152 183 182 152 153 184 183 153 154 185 184
-          155 156 187 186 156 157 188 187 157 158 189 188
-          158 159 190 189 159 160 191 190 160 161 192 191
-          161 162 193 192 162 163 194 193 163 164 195 194
-          164 165 196 195 165 166 197 196 166 167 198 197
-          167 168 199 198 168 169 200 199 169 170 201 200
-          170 171 202 201 171 172 203 202 172 173 204 203
-          173 174 205 204 174 175 206 205 175 176 207 206
-          176 177 208 207 177 178 209 208 178 179 210 209
-          179 180 211 210 180 181 212 211 181 182 213 212
-          182 183 214 213 183 184 215 214 184 185 216 215
-        </DataArray>
-        <DataArray type="Int32" Name="offsets" NumberOfComponents="1" format="ascii">
-          4 8 12 16 20 24 28 32 36 40 44 48
-          52 56 60 64 68 72 76 80 84 88 92 96
-          100 104 108 112 116 120 124 128 132 136 140 144
-          148 152 156 160 164 168 172 176 180 184 188 192
-          196 200 204 208 212 216 220 224 228 232 236 240
-          244 248 252 256 260 264 268 272 276 280 284 288
-          292 296 300 304 308 312 316 320 324 328 332 336
-          340 344 348 352 356 360 364 368 372 376 380 384
-          388 392 396 400 404 408 412 416 420 424 428 432
-          436 440 444 448 452 456 460 464 468 472 476 480
-          484 488 492 496 500 504 508 512 516 520 524 528
-          532 536 540 544 548 552 556 560 564 568 572 576
-          580 584 588 592 596 600 604 608 612 616 620 624
-          628 632 636 640 644 648 652 656 660 664 668 672
-          676 680 684 688 692 696 700 704 708 712 716 720
-        </DataArray>
-        <DataArray type="UInt8" Name="types" NumberOfComponents="1" format="ascii">
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-          9 9 9 9 9 9 9 9 9 9 9 9
-        </DataArray>
-      </Cells>
-    </Piece>
-  </UnstructuredGrid>
-</VTKFile>
diff --git a/test/decoupled/2p/test_impes.cc b/test/decoupled/2p/test_impes.cc
index 9aa8c4d715d24959b1743adb219f65a2453f9204..76ed765432cfbdcf34439edeacd75599b94f1fc4 100644
--- a/test/decoupled/2p/test_impes.cc
+++ b/test/decoupled/2p/test_impes.cc
@@ -28,7 +28,8 @@
  * \brief test for the sequential 2p model
  */
 #include "config.h"
-#include <dumux/common/structuredcubegridcreator.hh>
+#include <dumux/common/structuredsimplexgridcreator.hh>
+
 
 #include "test_impes_problem.hh"
 #include <dumux/common/start.hh>
diff --git a/test/decoupled/2p/test_impes_problem.hh b/test/decoupled/2p/test_impes_problem.hh
index a93c5161c716cebfb241f2667f8b2b8eefb359ab..48b9fd9ddd41eb83a76f8b687c43565b3dad48c3 100644
--- a/test/decoupled/2p/test_impes_problem.hh
+++ b/test/decoupled/2p/test_impes_problem.hh
@@ -67,13 +67,17 @@ namespace Properties
 NEW_TYPE_TAG(IMPESTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TestIMPESSpatialParams));
 
 // set the GridCreator property
-SET_TYPE_PROP(IMPESTestProblem, GridCreator, CubeGridCreator<TypeTag>);
+SET_TYPE_PROP(IMPESTestProblem, GridCreator, SimplexGridCreator<TypeTag>);
 
 // Set the grid type
 SET_PROP(IMPESTestProblem, Grid)
 {
+#if HAVE_UG
+    typedef Dune::UGGrid<2> type;
+#else
     typedef Dune::YaspGrid<2> type;
     //typedef Dune::SGrid<2, 2> type;
+#endif
 };
 
 // Set the problem property