diff --git a/bin/installexternal.sh b/bin/installexternal.sh
index 22d4bcbe54e89f17de01e31274f00d279a7d0aa6..ccc921f39c89f3e46ae108d9ec34d58deab74e3c 100755
--- a/bin/installexternal.sh
+++ b/bin/installexternal.sh
@@ -3,6 +3,7 @@
 CORRECT_LOCATION_FOR_DUNE_MODULES="n"
 ENABLE_MPI="n"
 ENABLE_DEBUG="n"
+ENABLE_PARALLEL="n"
 CLEANUP="n"
 DOWNLOAD_ONLY="n"
 
@@ -51,6 +52,10 @@ installCornerpoint()
         return
     fi
 
+    # apply patch
+    echo "Applying patch for dune-cornerpoint"
+    cd $TOPDIR/dune-cornerpoint
+    patch -p1 < $TOPDIR/dumux/patches/dune-cornerpoint-2015.04.patch
     cd $TOPDIR
 }
 
@@ -131,10 +136,10 @@ installMultidomainGrid()
     fi
 
     # apply patch for dune versions newer than 2.3
-    cd dune-common
-    DUNE_VERSION=`git status | head -n 1 | awk '{ print $3 }'`
-    if  [ "$DUNE_VERSION" == "releases/2.4" ] || [ "$DUNE_VERSION" == "master" ]; then
-        echo "Applying patch"
+    cd $TOPDIR/dune-common
+    DUNE_COMMON_VERSION=`git status | head -n 1 | awk '{ print $3 }'`
+    if  [ "$DUNE_COMMON_VERSION" == "releases/2.4" ] || [ "$DUNE_COMMON_VERSION" == "master" ]; then
+        echo "Applying patch for dune-multidomaingrid"
         cd $TOPDIR/dune-multidomaingrid
         patch -p1 < $TOPDIR/dumux/patches/multidomaingrid-2.3.patch
     fi
@@ -169,6 +174,22 @@ installOPM()
         return
     fi
 
+    # apply patches
+    echo "Applying patch for opm-core"
+    cd $TOPDIR/opm-core
+    patch -p1 < $TOPDIR/dumux/patches/opm-core-2015.04.patch
+    echo "Applying patch for opm-parser"
+    cd $TOPDIR/opm-parser
+    patch -p1 < $TOPDIR/dumux/patches/opm-parser-2015.04.patch
+
+    # show additional information
+    echo "In addition to applying the patches, it is necessary to set manually some"
+    echo "CMake variables in the CMAKE_FLAGS section of the .opts-file:"
+    echo "  -Ddune-cornerpoint_PREFIX=/path/to/dune-cornerpoint \\"
+    echo "  -Dopm-core_PREFIX=/path/to/opm-core \\"
+    echo "  -Dopm-parser_PREFIX=/path/to/opm-parser \\"
+    echo "  -DHAVE_DUNE_CORNERPOINT=1 \\"
+
     cd $TOPDIR
 }
 
@@ -244,7 +265,15 @@ installUG()
         tar zxvf ug-$UG_VERSION.tar.gz
     fi
 
-    cd ug-$UG_VERSION
+    # Apply patch for the parallel use of UG
+    cd $TOPDIR/dune-grid
+    DUNE_GRID_VERSION=`git status | head -n 1 | awk '{ print $3 }'`
+    if  [ "$DUNE_GRID_VERSION" == "releases/2.3.1" ] && [ "$ENABLE_PARALLEL" == "y" ]; then
+        echo "Applying patch for the parallel use of UG"
+        patch -p1 < $TOPDIR/dumux/patches/grid-2.3.1.patch
+    fi
+
+    cd $EXTDIR/ug-$UG_VERSION
     autoreconf -is
     OPTIM_FLAGS="-O3 -DNDEBUG -march=native -finline-functions -funroll-loops"
     # debug flags
@@ -265,6 +294,7 @@ installUG()
         CFLAGS="$CFLAGS" \
         CXXFLAGS="$CXXFLAGS" \
         $OPTS
+
     make
     make install
 
@@ -304,6 +334,7 @@ for TMP in "$@"; do
             DOWNLOAD_ONLY="y"
             ;;
         "--parallel")
+            ENABLE_PARALLEL="y"
             ENABLE_MPI="y"
             MPICC=$(which mpicc)
             MPICXX=$(which mpicxx)
diff --git a/dumux/common/intersectionmapper.hh b/dumux/common/intersectionmapper.hh
index 7d698b20065a05f5699258ff8b36726604a5a75d..044b40651b664c747c2e37fc47cb0ca19001e0a4 100644
--- a/dumux/common/intersectionmapper.hh
+++ b/dumux/common/intersectionmapper.hh
@@ -23,6 +23,7 @@
 
 #include<dune/common/deprecated.hh>
 #include<dune/grid/common/mcmgmapper.hh>
+#include<dune/grid/common/rangegenerators.hh>
 
 /*!
  * \file
diff --git a/dumux/implicit/adaptive/adaptionhelper.hh b/dumux/implicit/adaptive/adaptionhelper.hh
index 48e53f567fe0a69430700ed4f439707f9c8375ad..f15f75eea7df5b38718e0cd21b119bbafc2b487d 100644
--- a/dumux/implicit/adaptive/adaptionhelper.hh
+++ b/dumux/implicit/adaptive/adaptionhelper.hh
@@ -20,6 +20,7 @@
 #define DUMUX_ADAPTIONHELPER_HH
 
 #include <dune/grid/common/gridenums.hh>
+#include <dune/grid/common/rangegenerators.hh>
 #include <dune/grid/utility/persistentcontainer.hh>
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
 
diff --git a/dumux/io/interfacegridcreator.hh b/dumux/io/interfacegridcreator.hh
index 00f94fffe4810a3dbc842fe9aafc6f4bead68aed..d17952ecc624f796bea529ccbacf35852c1e57f4 100644
--- a/dumux/io/interfacegridcreator.hh
+++ b/dumux/io/interfacegridcreator.hh
@@ -98,7 +98,7 @@ public:
         std::shared_ptr<HelperGrid> helperGrid = std::shared_ptr<HelperGrid> (
             Dune::StructuredGridFactory<HelperGrid>::createCubeGrid(lowerLeft, upperRight, numCellsDummy));
 
-        const auto& helperElement = *helperGrid->leafGridView().template begin<0>();
+        const auto& helperElement = helperGrid->leafGridView().template begin<0>();
         const auto& helperGeometry = helperElement.geometry();
 
         Dune::FieldVector<Scalar,dim> refinePointLocal(helperGeometry.local(refinePoint));
diff --git a/dumux/io/plotoverline2d.hh b/dumux/io/plotoverline2d.hh
index a5f8ced1551670a47566851869319ec0e871e757..3cd8b555e5c56ee83df6d11b11ee09f6d92c0b82 100644
--- a/dumux/io/plotoverline2d.hh
+++ b/dumux/io/plotoverline2d.hh
@@ -31,6 +31,7 @@
 
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
+#include <dune/grid/common/rangegenerators.hh>
 
 #include <iostream>
 #include <fstream>
diff --git a/dumux/io/restart.hh b/dumux/io/restart.hh
index f306a580a89b82f1934dd7be8578b5f3f3cb5578..b639a245d623b0173e0c351a4e3365ee1290faf2 100644
--- a/dumux/io/restart.hh
+++ b/dumux/io/restart.hh
@@ -26,6 +26,7 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/fvector.hh>
 #include <dune/istl/bvector.hh>
+#include <dune/grid/common/rangegenerators.hh>
 
 #include <list>
 #include <string>
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2d.input b/test/decoupled/2p2c/test_adaptive2p2c2d.input
index ff93681a2c6c54d946bf31b9dc31832c2bcffc74..dbca627b52f14e7aa27ca4673bb7cf5544b559f3 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c2d.input
+++ b/test/decoupled/2p2c/test_adaptive2p2c2d.input
@@ -1,29 +1,29 @@
-[Impet]
-CFLFactor = 0.8
-ErrorTermLowerBound = 0.2
-ErrorTermUpperBound = 0.9
-ErrorTermFactor = 0.5
-EnableVolumeIntegral = 1
-RestrictFluxInTransport = 1
-
-[GridAdapt]
-MinLevel = 0
-MaxLevel = 1
-EnableMultiPointFluxApproximation = 1
-MaxInteractionVolumes = 2
-
-[Problem]
-SimulationName  = test_adaptive2p2c2d     # name of the output files
-OutputInterval = 5
-
-[TimeManager]
-TEnd= 3e3
-DtInitial = 200
-
-[Grid]
-NumberOfCellsX = 10# [-] level 0 resolution in x-direction
-NumberOfCellsY = 10# [-] level 0 resolution in y-direction
-
-UpperRightX = 10# [m] dimension of the grid
-UpperRightY = 10# [m] dimension of the grid # 2D
-
+[Impet]
+CFLFactor = 0.8
+ErrorTermLowerBound = 0.2
+ErrorTermUpperBound = 0.9
+ErrorTermFactor = 0.5
+EnableVolumeIntegral = 1
+RestrictFluxInTransport = 1
+
+[GridAdapt]
+MinLevel = 0
+MaxLevel = 1
+EnableMultiPointFluxApproximation = 1
+MaxInteractionVolumes = 2
+
+[Problem]
+SimulationName  = test_adaptive2p2c2d     # name of the output files
+OutputInterval = 5
+
+[TimeManager]
+TEnd= 3e3
+DtInitial = 200
+
+[Grid]
+NumberOfCellsX = 10# [-] level 0 resolution in x-direction
+NumberOfCellsY = 10# [-] level 0 resolution in y-direction
+
+UpperRightX = 10# [m] dimension of the grid
+UpperRightY = 10# [m] dimension of the grid # 2D
+
diff --git a/test/decoupled/2p2c/test_adaptive2p2c3d.input b/test/decoupled/2p2c/test_adaptive2p2c3d.input
index 5f6522d22d6c4b720d48d42c1ce96b744bf3841e..2accfa271df89e5cd61681bcc9ad9c10624b6792 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c3d.input
+++ b/test/decoupled/2p2c/test_adaptive2p2c3d.input
@@ -1,33 +1,33 @@
-[Impet]
-CFLFactor = 0.8
-ErrorTermLowerBound = 0.02
-ErrorTermUpperBound = 0.9
-ErrorTermFactor = 0.5
-EnableVolumeIntegral = 1
-RestrictFluxInTransport = 1
-
-[GridAdapt]
-EnableMultiPointFluxApproximation = 1
-MaxInteractionVolumes = 4
-MinLevel = 0
-MaxLevel = 1
-
-[Grid]
-NumberOfCellsX = 10 # [-] resolution in x-direction
-NumberOfCellsY = 10 # [-] resolution in y-direction
-NumberOfCellsZ = 10 # [-] resolution in z-direction
-
-UpperRightX = 10 # [m] length of the domain
-UpperRightY = 10 # [m] width of the domain
-UpperRightZ = 10 # [m] height of the domain
-
-[BoundaryConditions]
-Injectionrate = 1e-4	# kg / sec
-
-[Problem]
-Name  = test_adaptive2p2c3d     # name of the output files
-OutputInterval = 5
-
-[TimeManager]
-TEnd= 3e3 #Simulated time
-DtInitial = 500 #Initial time step 
+[Impet]
+CFLFactor = 0.8
+ErrorTermLowerBound = 0.02
+ErrorTermUpperBound = 0.9
+ErrorTermFactor = 0.5
+EnableVolumeIntegral = 1
+RestrictFluxInTransport = 1
+
+[GridAdapt]
+EnableMultiPointFluxApproximation = 1
+MaxInteractionVolumes = 4
+MinLevel = 0
+MaxLevel = 1
+
+[Grid]
+NumberOfCellsX = 10 # [-] resolution in x-direction
+NumberOfCellsY = 10 # [-] resolution in y-direction
+NumberOfCellsZ = 10 # [-] resolution in z-direction
+
+UpperRightX = 10 # [m] length of the domain
+UpperRightY = 10 # [m] width of the domain
+UpperRightZ = 10 # [m] height of the domain
+
+[BoundaryConditions]
+Injectionrate = 1e-4	# kg / sec
+
+[Problem]
+Name  = test_adaptive2p2c3d     # name of the output files
+OutputInterval = 5
+
+[TimeManager]
+TEnd= 3e3 #Simulated time
+DtInitial = 500 #Initial time step 
diff --git a/test/implicit/2pnc/test_box2pnc.input b/test/implicit/2pnc/test_box2pnc.input
index c212c0ed39b820df32f8caf38423863578fd286c..2bc445b56cc729ecf052205d01936afd3a7c678e 100644
--- a/test/implicit/2pnc/test_box2pnc.input
+++ b/test/implicit/2pnc/test_box2pnc.input
@@ -1,57 +1,57 @@
-# Parameter file for test case 2pncmin.
-# Everything behind a '#' is a comment.
-# Type "./test_2pncmin --help" for more information.
-
-[TimeManager]
-DtInitial = 5e-1                 # initial time step size [s]
-MaxTimeStepSize = 1000           # maximum time step size
-TEnd= 1e3                        # duration of the simulation [s]
-
-[Grid]
-#Number of cells in X and Y directions
-NumberOfCellsX = 21
-NumberOfCellsY = 6
-#Extend of entire domain
-UpperRightX = 2.0e-3 # x-coordinate of the upper-right corner of the grid [m]
-UpperRightY = 5.5e-4 # y-coordinate of the upper-right corner of the grid [m]
-
-[Problem]
-Name = fuelcell
-EnableGravity = 0
-
-[FluidSystem]
-NTemperature = 3                # [-] number of temperature table entries
-NPressure = 200                 # [-] number of pressure table entries
-PressureLow = 1e5               # [Pa] lower pressure limit for tabularization
-PressureHigh = 3e7              # [Pa] upper pressure limit for tabularization
-TemperatureLow = 312.15         # [K] lower temperature limit for tabularization
-TemperatureHigh = 314.15        # [K] upper temperature limit for tabularization
-InitialTemperature = 310        # [K] initial temperature for tabularization
-
-[ElectroChemistry]
-SpecificResistance = 0.25               #[Ohm*cm^2]
-ReversibleVoltage = 1.191               #[V]
-CellVoltage = 0.5                       #[V]
-ThermoneutralVoltage = 1.4836           #[V]
-RefCurrentDensity = 1.87e-8             #[A/cm] for calculating exchange current density at reference conditions
-RefO2PartialPressure = 5.0e5            #[Pa] for calculating exchange current density at reference conditions
-RefTemperature = 353.25                 #[K] for calculating exchange current density at reference conditions
-ActivationBarrier = 73.0e3              #[J/mol]
-TransferCoefficient = 0.5               #[-] (alpha)
-NumElectrons = 2                        #[-] number of electrons transferred in reaction
-SurfaceIncreasingFactor = 60
-TransportNumberH20 = 0.2327             #[-] account for osmotic H20 transport term from membrane, value Lena Walter
-pO2Inlet = 0.3e5                        #[Pa] partial pressure of oxygen at gas channel inlet
-MaxIterations = 300                     #[-] Maximum number for iterations for solving electrochemical system
-
-[Newton]
-RelTolerance = 1e-8
-TargetSteps = 10
-MaxSteps = 15
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-ResidualReduction = 1e-8
-Verbosity = 0
+# Parameter file for test case 2pncmin.
+# Everything behind a '#' is a comment.
+# Type "./test_2pncmin --help" for more information.
+
+[TimeManager]
+DtInitial = 5e-1                 # initial time step size [s]
+MaxTimeStepSize = 1000           # maximum time step size
+TEnd= 1e3                        # duration of the simulation [s]
+
+[Grid]
+#Number of cells in X and Y directions
+NumberOfCellsX = 21
+NumberOfCellsY = 6
+#Extend of entire domain
+UpperRightX = 2.0e-3 # x-coordinate of the upper-right corner of the grid [m]
+UpperRightY = 5.5e-4 # y-coordinate of the upper-right corner of the grid [m]
+
+[Problem]
+Name = fuelcell
+EnableGravity = 0
+
+[FluidSystem]
+NTemperature = 3                # [-] number of temperature table entries
+NPressure = 200                 # [-] number of pressure table entries
+PressureLow = 1e5               # [Pa] lower pressure limit for tabularization
+PressureHigh = 3e7              # [Pa] upper pressure limit for tabularization
+TemperatureLow = 312.15         # [K] lower temperature limit for tabularization
+TemperatureHigh = 314.15        # [K] upper temperature limit for tabularization
+InitialTemperature = 310        # [K] initial temperature for tabularization
+
+[ElectroChemistry]
+SpecificResistance = 0.25               #[Ohm*cm^2]
+ReversibleVoltage = 1.191               #[V]
+CellVoltage = 0.5                       #[V]
+ThermoneutralVoltage = 1.4836           #[V]
+RefCurrentDensity = 1.87e-8             #[A/cm] for calculating exchange current density at reference conditions
+RefO2PartialPressure = 5.0e5            #[Pa] for calculating exchange current density at reference conditions
+RefTemperature = 353.25                 #[K] for calculating exchange current density at reference conditions
+ActivationBarrier = 73.0e3              #[J/mol]
+TransferCoefficient = 0.5               #[-] (alpha)
+NumElectrons = 2                        #[-] number of electrons transferred in reaction
+SurfaceIncreasingFactor = 60
+TransportNumberH20 = 0.2327             #[-] account for osmotic H20 transport term from membrane, value Lena Walter
+pO2Inlet = 0.3e5                        #[Pa] partial pressure of oxygen at gas channel inlet
+MaxIterations = 300                     #[-] Maximum number for iterations for solving electrochemical system
+
+[Newton]
+RelTolerance = 1e-8
+TargetSteps = 10
+MaxSteps = 15
+WriteConvergence = false
+MaxTimeStepDivisions = 20
+
+[LinearSolver]
+ResidualReduction = 1e-8
+Verbosity = 0
 MaxIterations = 100
\ No newline at end of file
diff --git a/test/implicit/mpnc/test_boxmpnckinetic.input b/test/implicit/mpnc/test_boxmpnckinetic.input
index 4207de86bb45f386da0da16c96c3defff969fa44..21ee7b1f1d4d841be8018d6147d8542f741c9c84 100644
--- a/test/implicit/mpnc/test_boxmpnckinetic.input
+++ b/test/implicit/mpnc/test_boxmpnckinetic.input
@@ -1,75 +1,75 @@
-[TimeManager]
-DtInitial = 1.5 # [s]
-TEnd = 10 # [s]
-MaxTimeStepSize = 2e20 # maximum allowed timestep size
-
-[Grid]
-NumberOfCellsX = 14 #
-NumberOfCellsY = 30 #
-LowerLeftX = 0.0
-UpperRightX = 1.0
-LowerLeftY = 0.0
-UpperRightY = 0.5
-InterfacePosY = 0.25
-GradingFactorY = 1.13
-RefineTop = false
-
-[InitialConditions]
-SwFFInitial = 1e-5 # - 0.001#
-SwPMInitial = 0.999 # -
-pnInitial = 1e5 # 6.8e6 # 1e5 # 101475 	# Pa
-TInitial = 293
-pnInjection = 100003
-
-[BoundaryConditions]
-percentOfEquil = .1 # percentage of the equilibrium concentration water in the nPhase influx
-TInject = 293
-massFluxInjectedPhase = 0.75
-
-[SpatialParams.PorousMedium]
-permeability = 1e-11 # m^2
-porosity = 0.4 #
-meanPoreSize = 1e-4 # characteristic length of the system
-factorEnergyTransfer = 1 #
-factorMassTransfer = 1 #
-
-[SpatialParams.FreeFlow]
-permeability = 1e-6 # m^2
-porosity = 0.99 #
-meanPoreSize = 1e-2 # 4e-5  # characteristic length of the system
-
-[SpatialParams.soil]
-density = 2600. 	# kg/m^3 http://www.agriinfo.in/default.aspx?page=topic&superid=4&topicid=271
-thermalConductivity = 3 # W / (m K)
-heatCapacity= 817 # J / (kg K)
-# characteristic length, i.e. mean pore size
-# 40 micrometer i.e. 1e-5 for the micromodel
-
-VGAlpha = 3.512e-04 #
-VGN = 4.716e+00 #
-Swr = 0 #
-Snr = 0 #
-specificSolidsurface = 4022.994# (1/m)
-
-aWettingNonWettingA1 = -1.603e-01 #
-aWettingNonWettingA2 = 1.429e-05 #
-aWettingNonWettingA3 = 1.915e-01 #
-
-BCPd = 2.290e+03 #
-BClambda = 2.740e+00 #
-
-aNonWettingSolidA1 = 1.369e+03 #
-aNonWettingSolidA2 = -3.782e+00 #
-aNonWettingSolidA3 = 1.063e-09 #
-
-[SourceSink]
-heatIntoSolid = 0  #
-
-[Constants]
-outputName = evaporationatmosphere
-nRestart = 100 # after so many timesteps a restart file should be written
-
-[FluidSystem]
-nTemperature = 100 # for the tabulation of water: so many interpolation points
-nPressure = 100 # for the tabulation of water: so many interpolation points
-hammer = 1e4
+[TimeManager]
+DtInitial = 1.5 # [s]
+TEnd = 10 # [s]
+MaxTimeStepSize = 2e20 # maximum allowed timestep size
+
+[Grid]
+NumberOfCellsX = 14 #
+NumberOfCellsY = 30 #
+LowerLeftX = 0.0
+UpperRightX = 1.0
+LowerLeftY = 0.0
+UpperRightY = 0.5
+InterfacePosY = 0.25
+GradingFactorY = 1.13
+RefineTop = false
+
+[InitialConditions]
+SwFFInitial = 1e-5 # - 0.001#
+SwPMInitial = 0.999 # -
+pnInitial = 1e5 # 6.8e6 # 1e5 # 101475 	# Pa
+TInitial = 293
+pnInjection = 100003
+
+[BoundaryConditions]
+percentOfEquil = .1 # percentage of the equilibrium concentration water in the nPhase influx
+TInject = 293
+massFluxInjectedPhase = 0.75
+
+[SpatialParams.PorousMedium]
+permeability = 1e-11 # m^2
+porosity = 0.4 #
+meanPoreSize = 1e-4 # characteristic length of the system
+factorEnergyTransfer = 1 #
+factorMassTransfer = 1 #
+
+[SpatialParams.FreeFlow]
+permeability = 1e-6 # m^2
+porosity = 0.99 #
+meanPoreSize = 1e-2 # 4e-5  # characteristic length of the system
+
+[SpatialParams.soil]
+density = 2600. 	# kg/m^3 http://www.agriinfo.in/default.aspx?page=topic&superid=4&topicid=271
+thermalConductivity = 3 # W / (m K)
+heatCapacity= 817 # J / (kg K)
+# characteristic length, i.e. mean pore size
+# 40 micrometer i.e. 1e-5 for the micromodel
+
+VGAlpha = 3.512e-04 #
+VGN = 4.716e+00 #
+Swr = 0 #
+Snr = 0 #
+specificSolidsurface = 4022.994# (1/m)
+
+aWettingNonWettingA1 = -1.603e-01 #
+aWettingNonWettingA2 = 1.429e-05 #
+aWettingNonWettingA3 = 1.915e-01 #
+
+BCPd = 2.290e+03 #
+BClambda = 2.740e+00 #
+
+aNonWettingSolidA1 = 1.369e+03 #
+aNonWettingSolidA2 = -3.782e+00 #
+aNonWettingSolidA3 = 1.063e-09 #
+
+[SourceSink]
+heatIntoSolid = 0  #
+
+[Constants]
+outputName = evaporationatmosphere
+nRestart = 100 # after so many timesteps a restart file should be written
+
+[FluidSystem]
+nTemperature = 100 # for the tabulation of water: so many interpolation points
+nPressure = 100 # for the tabulation of water: so many interpolation points
+hammer = 1e4
diff --git a/test/implicit/mpnc/test_boxmpncthermalnonequil.input b/test/implicit/mpnc/test_boxmpncthermalnonequil.input
index 26cd1abe4e4211f05301027a57dc0ca4c4e7dce6..3e049b6d2759bc140a4252af55a0ecaf70261062 100644
--- a/test/implicit/mpnc/test_boxmpncthermalnonequil.input
+++ b/test/implicit/mpnc/test_boxmpncthermalnonequil.input
@@ -1,55 +1,55 @@
-[TimeManager]
-DtInitial			= 5e-1	# [s]
-TEnd 			= 1e3 	# [s]
-MaxTimeStepSize	= 2e20 	# maximum allowed timestep size
-
-[Grid]
-File =   ./grids/combustionOutflowGridLinNX100LogNx100.dgf
-# File =   ./grids/combustionGrid.dgf
-lengthPM = 0.1
-
-[InitialConditions]
-pnInitial		= 1e5 # 6.8e6 # 1e5 # 101475 	# Pa
-TInitial		=  372 # 373.15 #
-TRight 		=  400 # 373.15 #
-
-[BoundaryConditions]
-TBoundary 			=300 #
-SwBoundary 			= 1e-3 #
-SwOneComponentSys 	= 1	 #
-
-massFluxInjectedPhase =   0.5 #
-# heatFluxFromRight    =      2e6      # fluid  temperature on boundary: analytical approx 1080 K
-heatFluxFromRight 	=      1.5e6 	# fluid  temperature on boundary: analytical approx 587.3 K
-coldTime = 1
-
-[SpatialParams.PorousMedium]
-porosity			= 0.35 	#
-meanPoreSize		= 5e-4 	# characteristic length of the system
-factorEnergyTransfer	= 1		#
-factorMassTransfer	= 1		#
-
-[SpatialParams.OutFlow]
-permeabilityOutFlow			= 1e-6 	# m^2
-porosityOutFlow				= 0.35 	#
-soilThermalConductivityOutFlow	= 0.01#
-
-[SpatialParams.soil]
-density 					= 2600. 	# kg/m^3
-thermalConductivity 		= 30 	# W / (m K) soil:3, metal:30
-heatCapacity				= 466 	# J / (kg K) steel:466 granite:800
-
-Swr =  0.0 #  5e-3
-Snr = 0 #
-
-[Constants]
-outputName =  combustion #
-
-interfacialTension = 0.0589 # interfacial tension of water at 100 ° C
-
-nRestart		= 10000  	 	# after so many timesteps a restart file should be written
-
-[Implicit]
-MassUpwindWeight=1
-MobilityUpwindWeight=1
-
+[TimeManager]
+DtInitial			= 5e-1	# [s]
+TEnd 			= 1e3 	# [s]
+MaxTimeStepSize	= 2e20 	# maximum allowed timestep size
+
+[Grid]
+File =   ./grids/combustionOutflowGridLinNX100LogNx100.dgf
+# File =   ./grids/combustionGrid.dgf
+lengthPM = 0.1
+
+[InitialConditions]
+pnInitial		= 1e5 # 6.8e6 # 1e5 # 101475 	# Pa
+TInitial		=  372 # 373.15 #
+TRight 		=  400 # 373.15 #
+
+[BoundaryConditions]
+TBoundary 			=300 #
+SwBoundary 			= 1e-3 #
+SwOneComponentSys 	= 1	 #
+
+massFluxInjectedPhase =   0.5 #
+# heatFluxFromRight    =      2e6      # fluid  temperature on boundary: analytical approx 1080 K
+heatFluxFromRight 	=      1.5e6 	# fluid  temperature on boundary: analytical approx 587.3 K
+coldTime = 1
+
+[SpatialParams.PorousMedium]
+porosity			= 0.35 	#
+meanPoreSize		= 5e-4 	# characteristic length of the system
+factorEnergyTransfer	= 1		#
+factorMassTransfer	= 1		#
+
+[SpatialParams.OutFlow]
+permeabilityOutFlow			= 1e-6 	# m^2
+porosityOutFlow				= 0.35 	#
+soilThermalConductivityOutFlow	= 0.01#
+
+[SpatialParams.soil]
+density 					= 2600. 	# kg/m^3
+thermalConductivity 		= 30 	# W / (m K) soil:3, metal:30
+heatCapacity				= 466 	# J / (kg K) steel:466 granite:800
+
+Swr =  0.0 #  5e-3
+Snr = 0 #
+
+[Constants]
+outputName =  combustion #
+
+interfacialTension = 0.0589 # interfacial tension of water at 100 ° C
+
+nRestart		= 10000  	 	# after so many timesteps a restart file should be written
+
+[Implicit]
+MassUpwindWeight=1
+MobilityUpwindWeight=1
+
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input
index 1daa03021dc6a9e1d87c9954dc8a158e60a48e37..116f2bc573eb3bcef0fc8201d391d6e1fb32e6db 100644
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input
+++ b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input
@@ -1,82 +1,82 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 360 # [s]
-InitTime = 864 # [s] Initialization time without coupling
-TEnd= 0.864e6 # [s]
-EpisodeLength = 43200 # [s]
-
-[Grid]
-# File = grids/test_2cnistokes2p2cni.dgf # unused, if interface mesh creator is used
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.25 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.5 # [m]
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-# Number of elements in x-, y-, z-direction
-NumberOfCellsX = 30
-NumberOfCellsY = 62
-# Grading and refinement of the mesh in y direction
-GradingFactorY = 1.13
-RefineTopY = false
-
-[Output]
-NameFF = stokes2cni
-NamePM = 2p2cni
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000      # how often restart files are written out
-FreqOutput = 10         # frequency of VTK output
-FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
-FreqFluxOutput = 1000   # frequency of detailed flux output
-FreqVaporFluxOutput = 2 # frequency of summarized flux output
-LiveEvaporationRates = true # plot evaporation rates using gnuplot interface
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-UseDirichletBC = true # dirichlet values are set at the inflow boundary
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
+[TimeManager]
+DtInitial = 5e-1 # [s]
+MaxTimeStepSize = 360 # [s]
+InitTime = 864 # [s] Initialization time without coupling
+TEnd= 0.864e6 # [s]
+EpisodeLength = 43200 # [s]
+
+[Grid]
+# File = grids/test_2cnistokes2p2cni.dgf # unused, if interface mesh creator is used
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.25 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.5 # [m]
+RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
+NoDarcyX = 0.0 # [m] Horizontal position without PM below
+InterfacePosY = 0.25 # [m] Vertical position of coupling interface
+# Number of elements in x-, y-, z-direction
+NumberOfCellsX = 30
+NumberOfCellsY = 62
+# Grading and refinement of the mesh in y direction
+GradingFactorY = 1.13
+RefineTopY = false
+
+[Output]
+NameFF = stokes2cni
+NamePM = 2p2cni
+#Frequency of restart file, flux and VTK output
+FreqRestart = 1000      # how often restart files are written out
+FreqOutput = 10         # frequency of VTK output
+FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
+FreqFluxOutput = 1000   # frequency of detailed flux output
+FreqVaporFluxOutput = 2 # frequency of summarized flux output
+LiveEvaporationRates = true # plot evaporation rates using gnuplot interface
+
+[Stokes]
+StabilizationAlpha = -1.0
+
+[FreeFlow]
+UseDirichletBC = true # dirichlet values are set at the inflow boundary
+RefVelocity = 3.5 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+SinusVelAmplitude = 0.0 # [m/s]
+SinusVelPeriod = 3600 # [s]
+SinusPressureAmplitude = 0.0 # [Pa]
+SinusPressurePeriod = 3600 # [s]
+SinusConcentrationAmplitude = 0.0 # [-]
+SinusConcentrationPeriod = 3600 # [s]
+SinusTemperatureAmplitude = 0.0 # [K]
+SinusTemperaturePeriod = 3600 # [s]
+
+[BoundaryLayer]
+Model = 0
+
+[MassTransfer]
+Model = 0
+
+[PorousMedium]
+RefPressure = 1e5 # [Pa]
+RefTemperature = 298.15 # [K]
+InitialSw = 0.98 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 8.0 # [-]
+LambdaSolid = 5.26 # [W/(m*K)]
+
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 8
+MaxSteps = 12
+WriteConvergence = false
+MaxTimeStepDivisions = 20
+
+[LinearSolver]
+Verbosity = 0
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_boundarylayer.input b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_boundarylayer.input
index b881a4069f2d1811051f3609569b05f98ed422e0..1e8661274004ae271b75d1c1972a5d46dacaa0af 100644
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_boundarylayer.input
+++ b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_boundarylayer.input
@@ -1,85 +1,85 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 360 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd= 3600 # [s]
-EpisodeLength = 43200 # [s]
-
-[Grid]
-# File = grids/test_2cnistokes2p2cni.dgf # unused, if interface mesh creator is used
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.25 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.5 # [m]
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-# Number of elements in x-, y-, z-direction
-NumberOfCellsX = 15
-NumberOfCellsY = 20
-# Grading and refinement of the mesh in y direction
-GradingFactorY = 1.1
-RefineTopY = false
-
-[Output]
-NameFF = stokes2cni_boundarylayer
-NamePM = 2p2cni_boundarylayer
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000      # how often restart files are written out
-FreqOutput = 10         # frequency of VTK output
-FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
-FreqFluxOutput = 1000   # frequency of detailed flux output
-FreqVaporFluxOutput = 2 # frequency of summarized flux output
-LiveEvaporationRates = false # plot evaporation rates using gnuplot interface
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-UseDirichletBC = true # dirichlet values are set at the inflow boundary
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 4 # Number/ID of the used model
-Offset = 0.25 # Virtual run-up distance for BL models [m]
-YPlus = 10 # Conversion value (model 4-6) [-]
-
-[MassTransfer]
-Model = 4
-CharPoreRadius = 0.001 # Characteristic pore radius for Schluender model (model 2+4) [m]
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
+[TimeManager]
+DtInitial = 5e-1 # [s]
+MaxTimeStepSize = 360 # [s]
+InitTime = 0 # [s] Initialization time without coupling
+TEnd= 3600 # [s]
+EpisodeLength = 43200 # [s]
+
+[Grid]
+# File = grids/test_2cnistokes2p2cni.dgf # unused, if interface mesh creator is used
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.25 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.5 # [m]
+RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
+NoDarcyX = 0.0 # [m] Horizontal position without PM below
+InterfacePosY = 0.25 # [m] Vertical position of coupling interface
+# Number of elements in x-, y-, z-direction
+NumberOfCellsX = 15
+NumberOfCellsY = 20
+# Grading and refinement of the mesh in y direction
+GradingFactorY = 1.1
+RefineTopY = false
+
+[Output]
+NameFF = stokes2cni_boundarylayer
+NamePM = 2p2cni_boundarylayer
+#Frequency of restart file, flux and VTK output
+FreqRestart = 1000      # how often restart files are written out
+FreqOutput = 10         # frequency of VTK output
+FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
+FreqFluxOutput = 1000   # frequency of detailed flux output
+FreqVaporFluxOutput = 2 # frequency of summarized flux output
+LiveEvaporationRates = false # plot evaporation rates using gnuplot interface
+
+[Stokes]
+StabilizationAlpha = -1.0
+
+[FreeFlow]
+UseDirichletBC = true # dirichlet values are set at the inflow boundary
+RefVelocity = 3.5 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+SinusVelAmplitude = 0.0 # [m/s]
+SinusVelPeriod = 3600 # [s]
+SinusPressureAmplitude = 0.0 # [Pa]
+SinusPressurePeriod = 3600 # [s]
+SinusConcentrationAmplitude = 0.0 # [-]
+SinusConcentrationPeriod = 3600 # [s]
+SinusTemperatureAmplitude = 0.0 # [K]
+SinusTemperaturePeriod = 3600 # [s]
+
+[BoundaryLayer]
+Model = 4 # Number/ID of the used model
+Offset = 0.25 # Virtual run-up distance for BL models [m]
+YPlus = 10 # Conversion value (model 4-6) [-]
+
+[MassTransfer]
+Model = 4
+CharPoreRadius = 0.001 # Characteristic pore radius for Schluender model (model 2+4) [m]
+
+[PorousMedium]
+RefPressure = 1e5 # [Pa]
+RefTemperature = 298.15 # [K]
+InitialSw = 0.98 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 8.0 # [-]
+LambdaSolid = 5.26 # [W/(m*K)]
+
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 8
+MaxSteps = 12
+WriteConvergence = false
+MaxTimeStepDivisions = 20
+
+[LinearSolver]
+Verbosity = 0
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input
index 81146b1db1f3b0e299981546ead2ea7f64ead4ba..d3f1f808637ea0c001ed9aa046d7b2020e18b312 100644
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input
+++ b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input
@@ -1,82 +1,82 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 240 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd= 3600 # [s]
-EpisodeLength = 43200 # [s]
-
-[Grid]
-# File = grids/test_2cnistokes2p2cni.dgf # unused, if interface mesh creator is used
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.25 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.5 # [m]
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-# Number of elements in x-, y-, z-direction
-NumberOfCellsX = 15
-NumberOfCellsY = 20
-# Grading and refinement of the mesh in y direction
-GradingFactorY = 1.1
-RefineTopY = false
-
-[Output]
-NameFF = stokes2cni
-NamePM = 2p2cni
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000      # how often restart files are written out
-FreqOutput = 10         # frequency of VTK output
-FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
-FreqFluxOutput = 1000   # frequency of detailed flux output
-FreqVaporFluxOutput = 2 # frequency of summarized flux output
-LiveEvaporationRates = false # plot evaporation rates using gnuplot interface
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-UseDirichletBC = true # dirichlet values are set at the inflow boundary
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
+[TimeManager]
+DtInitial = 5e-1 # [s]
+MaxTimeStepSize = 240 # [s]
+InitTime = 0 # [s] Initialization time without coupling
+TEnd= 3600 # [s]
+EpisodeLength = 43200 # [s]
+
+[Grid]
+# File = grids/test_2cnistokes2p2cni.dgf # unused, if interface mesh creator is used
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.25 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.5 # [m]
+RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
+NoDarcyX = 0.0 # [m] Horizontal position without PM below
+InterfacePosY = 0.25 # [m] Vertical position of coupling interface
+# Number of elements in x-, y-, z-direction
+NumberOfCellsX = 15
+NumberOfCellsY = 20
+# Grading and refinement of the mesh in y direction
+GradingFactorY = 1.1
+RefineTopY = false
+
+[Output]
+NameFF = stokes2cni
+NamePM = 2p2cni
+#Frequency of restart file, flux and VTK output
+FreqRestart = 1000      # how often restart files are written out
+FreqOutput = 10         # frequency of VTK output
+FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
+FreqFluxOutput = 1000   # frequency of detailed flux output
+FreqVaporFluxOutput = 2 # frequency of summarized flux output
+LiveEvaporationRates = false # plot evaporation rates using gnuplot interface
+
+[Stokes]
+StabilizationAlpha = -1.0
+
+[FreeFlow]
+UseDirichletBC = true # dirichlet values are set at the inflow boundary
+RefVelocity = 3.5 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+SinusVelAmplitude = 0.0 # [m/s]
+SinusVelPeriod = 3600 # [s]
+SinusPressureAmplitude = 0.0 # [Pa]
+SinusPressurePeriod = 3600 # [s]
+SinusConcentrationAmplitude = 0.0 # [-]
+SinusConcentrationPeriod = 3600 # [s]
+SinusTemperatureAmplitude = 0.0 # [K]
+SinusTemperaturePeriod = 3600 # [s]
+
+[BoundaryLayer]
+Model = 0
+
+[MassTransfer]
+Model = 0
+
+[PorousMedium]
+RefPressure = 1e5 # [Pa]
+RefTemperature = 298.15 # [K]
+InitialSw = 0.98 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 8.0 # [-]
+LambdaSolid = 5.26 # [W/(m*K)]
+
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 8
+MaxSteps = 12
+WriteConvergence = false
+MaxTimeStepDivisions = 20
+
+[LinearSolver]
+Verbosity = 0
diff --git a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.input b/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.input
index 1bfed64d9ebdc858626e38f470332b5f4cdf3c23..245e3c3d35faaf66627824d461c3a2d3cabc860b 100644
--- a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.input
+++ b/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.input
@@ -1,85 +1,85 @@
-[TimeManager]
-DtInitial = 5e-5 # [s]
-MaxTimeStepSize = 360 # [s]
-TEnd = 3600 # [s]
-EpisodeLength = 14400 # [s] # 14400s = 4h
-
-[Grid]
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.75 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.75 # [m]
-# Number of elements in x-, y-direction
-NumberOfCellsX = 15
-NumberOfCellsY = 30
-# Grading and refinement of the mesh
-GradingFactorY = 1.16
-RefineTopY = true
-# Position information
-NoDarcyX1 = 0.25 # [m] # Beginning of PM below
-NoDarcyX2 = 0.5 # [m] # End of PM below
-RunUpDistanceX1 = 0.251 # [m] # Beginning of without Coupling to PM (x-coordinate)
-RunUpDistanceX2 = 0.499 # [m] # End of without Coupling to PM (x-coordinate)
-InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
-
-[Output]
-NameFF = zeroeq2cni
-NamePM = 2p2cni
-# Frequency of restart file, flux and VTK output
-FreqRestart = 5              # how often restart files are written out
-FreqOutput = 5               #  10  # frequency of VTK output
-FreqMassOutput = 5           #  20  # frequency of mass and evaporation rate output (Darcy)
-
-[FreeFlow]
-RefVelocity = 1.0 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-
-[BoundaryLayer]
-Model = 0 # disable boundary layer models
-
-[MassTransfer]
-Model = 0 # disable mass transfer models
-
-[PorousMedium]
-RefPressurePM = 1e5 # [Pa]
-RefTemperaturePM = 298.15 # [K]
-RefSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-ThermalConductivitySolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-
-[LinearSolver]
-Verbosity = 0
-
-[ZeroEq]
-# Eddy Viscosity Models
-# 0 = none
-# 1 = Prandtl
-# 2 = modified Van Driest
-# 3 = Baldwin Lomax
-EddyViscosityModel = 2
-# Eddy Diffusivity and Eddy Conductivity Models
-# 0 = none
-# 1 = Reynolds analogy
-# 2 = modified Van Driest
-# 3 = Deissler
-# 4 = Meier and Rotta
-EddyDiffusivityModel = 3
-EddyConductivityModel = 3
-BBoxMinSandGrainRoughness = 0.0 # [m]
-BBoxMaxSandGrainRoughness = 0.0 # [m]
+[TimeManager]
+DtInitial = 5e-5 # [s]
+MaxTimeStepSize = 360 # [s]
+TEnd = 3600 # [s]
+EpisodeLength = 14400 # [s] # 14400s = 4h
+
+[Grid]
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.75 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.75 # [m]
+# Number of elements in x-, y-direction
+NumberOfCellsX = 15
+NumberOfCellsY = 30
+# Grading and refinement of the mesh
+GradingFactorY = 1.16
+RefineTopY = true
+# Position information
+NoDarcyX1 = 0.25 # [m] # Beginning of PM below
+NoDarcyX2 = 0.5 # [m] # End of PM below
+RunUpDistanceX1 = 0.251 # [m] # Beginning of without Coupling to PM (x-coordinate)
+RunUpDistanceX2 = 0.499 # [m] # End of without Coupling to PM (x-coordinate)
+InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
+
+[Output]
+NameFF = zeroeq2cni
+NamePM = 2p2cni
+# Frequency of restart file, flux and VTK output
+FreqRestart = 5              # how often restart files are written out
+FreqOutput = 5               #  10  # frequency of VTK output
+FreqMassOutput = 5           #  20  # frequency of mass and evaporation rate output (Darcy)
+
+[FreeFlow]
+RefVelocity = 1.0 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+
+[BoundaryLayer]
+Model = 0 # disable boundary layer models
+
+[MassTransfer]
+Model = 0 # disable mass transfer models
+
+[PorousMedium]
+RefPressurePM = 1e5 # [Pa]
+RefTemperaturePM = 298.15 # [K]
+RefSw = 0.98 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 8.0 # [-]
+ThermalConductivitySolid = 5.26 # [W/(m*K)]
+
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 8
+MaxSteps = 12
+WriteConvergence = false
+
+[LinearSolver]
+Verbosity = 0
+
+[ZeroEq]
+# Eddy Viscosity Models
+# 0 = none
+# 1 = Prandtl
+# 2 = modified Van Driest
+# 3 = Baldwin Lomax
+EddyViscosityModel = 2
+# Eddy Diffusivity and Eddy Conductivity Models
+# 0 = none
+# 1 = Reynolds analogy
+# 2 = modified Van Driest
+# 3 = Deissler
+# 4 = Meier and Rotta
+EddyDiffusivityModel = 3
+EddyConductivityModel = 3
+BBoxMinSandGrainRoughness = 0.0 # [m]
+BBoxMaxSandGrainRoughness = 0.0 # [m]
diff --git a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input
index 4e74e4af9f24d311808516cbc811e0005fdf6f61..45f4e3bd13ca811b3a927825e2970cf3f519f5a0 100644
--- a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input
+++ b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input
@@ -1,80 +1,80 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 360 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd = 7200 # [s]
-EpisodeLength = 3600 # [s]
-
-[Grid]
-# File = grids/test_2cstokes2p2c.dgf # unused, if interface mesh creator is used
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.25 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.5 # [m]
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-# Number of elements in x-, y-, z-direction
-NumberOfCellsX = 30
-NumberOfCellsY = 62
-# Grading and refinement of the mesh in y direction
-GradingFactorY = 1.13
-RefineTopY = false
-
-[Output]
-NameFF = stokes2c
-NamePM = 2p2c
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000      # how often restart files are written out 
-FreqOutput = 50         # frequency of VTK output
-FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
-FreqFluxOutput = 1000   # frequency of detailed flux output
-FreqVaporFluxOutput = 2 # frequency of summarized flux output
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-LambdaSolid = 5.3 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
+[TimeManager]
+DtInitial = 5e-1 # [s]
+MaxTimeStepSize = 360 # [s]
+InitTime = 0 # [s] Initialization time without coupling
+TEnd = 7200 # [s]
+EpisodeLength = 3600 # [s]
+
+[Grid]
+# File = grids/test_2cstokes2p2c.dgf # unused, if interface mesh creator is used
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.25 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.5 # [m]
+RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
+NoDarcyX = 0.0 # [m] Horizontal position without PM below
+InterfacePosY = 0.25 # [m] Vertical position of coupling interface
+# Number of elements in x-, y-, z-direction
+NumberOfCellsX = 30
+NumberOfCellsY = 62
+# Grading and refinement of the mesh in y direction
+GradingFactorY = 1.13
+RefineTopY = false
+
+[Output]
+NameFF = stokes2c
+NamePM = 2p2c
+#Frequency of restart file, flux and VTK output
+FreqRestart = 1000      # how often restart files are written out 
+FreqOutput = 50         # frequency of VTK output
+FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
+FreqFluxOutput = 1000   # frequency of detailed flux output
+FreqVaporFluxOutput = 2 # frequency of summarized flux output
+
+[Stokes]
+StabilizationAlpha = -1.0
+
+[FreeFlow]
+RefVelocity = 3.5 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+SinusVelAmplitude = 0.0 # [m/s]
+SinusVelPeriod = 3600 # [s]
+SinusPressureAmplitude = 0.0 # [Pa]
+SinusPressurePeriod = 3600 # [s]
+SinusConcentrationAmplitude = 0.0 # [-]
+SinusConcentrationPeriod = 3600 # [s]
+SinusTemperatureAmplitude = 0.0 # [K]
+SinusTemperaturePeriod = 3600 # [s]
+
+[BoundaryLayer]
+Model = 0
+
+[MassTransfer]
+Model = 0
+
+[PorousMedium]
+RefPressure = 1e5 # [Pa]
+RefTemperature = 298.15 # [K]
+InitialSw = 0.98 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 6.9 # [-]
+LambdaSolid = 5.3 # [W/(m*K)]
+
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 8
+MaxSteps = 12
+WriteConvergence = false
+MaxTimeStepDivisions = 20
+
+[LinearSolver]
+Verbosity = 0
diff --git a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input
index e1f2cdf7ace60b79d6b657bc176fe5adecc74024..8027b9466885d2503ecc817c8984871c6514fa28 100644
--- a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input
+++ b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input
@@ -1,80 +1,80 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 240 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd = 7200 # [s]
-EpisodeLength = 3600 # [s]
-
-[Grid]
-# File = grids/test_2cstokes2p2c.dgf # unused, if interface mesh creator is used
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.25 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.5 # [m]
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-# Number of elements in x-, y-, z-direction
-NumberOfCellsX = 25
-NumberOfCellsY = 45
-# Grading and refinement of the mesh in y direction
-GradingFactorY = 1.1
-RefineTopY = false
-
-[Output]
-NameFF = stokes2c
-NamePM = 2p2c
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000      # how often restart files are written out 
-FreqOutput = 10         # frequency of VTK output
-FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
-FreqFluxOutput = 1000   # frequency of detailed flux output
-FreqVaporFluxOutput = 2 # frequency of summarized flux output
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
+[TimeManager]
+DtInitial = 5e-1 # [s]
+MaxTimeStepSize = 240 # [s]
+InitTime = 0 # [s] Initialization time without coupling
+TEnd = 7200 # [s]
+EpisodeLength = 3600 # [s]
+
+[Grid]
+# File = grids/test_2cstokes2p2c.dgf # unused, if interface mesh creator is used
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.25 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.5 # [m]
+RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
+NoDarcyX = 0.0 # [m] Horizontal position without PM below
+InterfacePosY = 0.25 # [m] Vertical position of coupling interface
+# Number of elements in x-, y-, z-direction
+NumberOfCellsX = 25
+NumberOfCellsY = 45
+# Grading and refinement of the mesh in y direction
+GradingFactorY = 1.1
+RefineTopY = false
+
+[Output]
+NameFF = stokes2c
+NamePM = 2p2c
+#Frequency of restart file, flux and VTK output
+FreqRestart = 1000      # how often restart files are written out 
+FreqOutput = 10         # frequency of VTK output
+FreqMassOutput = 2      # frequency of mass and evaporation rate output (Darcy)
+FreqFluxOutput = 1000   # frequency of detailed flux output
+FreqVaporFluxOutput = 2 # frequency of summarized flux output
+
+[Stokes]
+StabilizationAlpha = -1.0
+
+[FreeFlow]
+RefVelocity = 3.5 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+SinusVelAmplitude = 0.0 # [m/s]
+SinusVelPeriod = 3600 # [s]
+SinusPressureAmplitude = 0.0 # [Pa]
+SinusPressurePeriod = 3600 # [s]
+SinusConcentrationAmplitude = 0.0 # [-]
+SinusConcentrationPeriod = 3600 # [s]
+SinusTemperatureAmplitude = 0.0 # [K]
+SinusTemperaturePeriod = 3600 # [s]
+
+[BoundaryLayer]
+Model = 0
+
+[MassTransfer]
+Model = 0
+
+[PorousMedium]
+RefPressure = 1e5 # [Pa]
+RefTemperature = 298.15 # [K]
+InitialSw = 0.98 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 6.9 # [-]
+LambdaSolid = 5.26 # [W/(m*K)]
+
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 8
+MaxSteps = 12
+WriteConvergence = false
+MaxTimeStepDivisions = 20
+
+[LinearSolver]
+Verbosity = 0
diff --git a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
index 301f34a5d0e94c69167ccbe3fcbbee195731fbab..6eac23eca64124f9508a5586a6b62657ace5263e 100644
--- a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
+++ b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
@@ -53,7 +53,7 @@ SET_TYPE_PROP(TwoCZeroEqTwoPTwoCProblem, Grid, Dune::UGGrid<2>);
 #elif HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(TwoCZeroEqTwoPTwoCProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 #else
-SET_TYPE_PROP(TwoCStokesTwoPTwoCProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(TwoCZeroEqTwoPTwoCProblem, Grid, Dune::YaspGrid<2>);
 #endif
 
 // Set the global problem
diff --git a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.input b/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.input
index 9581139c771213c86e88b2626e2eb22ea4fc9216..f1634850388f252b446db95a7881ab5ca2e5b441 100644
--- a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.input
+++ b/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.input
@@ -1,76 +1,76 @@
-[TimeManager]
-DtInitial = 5e-5 # [s]
-MaxTimeStepSize = 900 # [s]
-TEnd = 518400 # [s] # 518400 = 6 days
-EpisodeLength = 8e5 # [s] # 43200
-
-[Grid]
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.5 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.75 # [m]
-# Number of elements in x-, y-direction
-NumberOfCellsX = 20
-NumberOfCellsY = 40
-# Grading and refinement of the mesh
-GradingFactorY = 1.16
-RefineTopY = false
-# Position information
-NoDarcyX = 0.25 # [m] # Horizontal position without PM below
-RunUpDistanceX = 0.26 # [m] # Horizontal position without Coupling to PM
-InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
-
-[Output]
-NameFF = zeroeq2c
-NamePM = 2p2c
-# Frequency of restart file, flux and VTK output
-FreqRestart = 50            # 500  # how often restart files are written out
-FreqOutput = 5               #  10  # frequency of VTK output
-FreqMassOutput = 5           #  20  # frequency of mass and evaporation rate output (Darcy)
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-
-[PorousMedium]
-RefPressurePM = 1e5 # [Pa]
-RefTemperaturePM = 298.15 # [K]
-RefSw = 0.9 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-
-# optional parameters
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 10
-MaxSteps = 15
-WriteConvergence = false
-
-[LinearSolver]
-Verbosity = 0
-
-[ZeroEq]
-# Eddy Viscosity Models
-# 0 = none
-# 1 = Prandtl
-# 2 = modified Van Driest
-# 3 = Baldwin Lomax
-EddyViscosityModel = 3
-# Eddy Diffusivity Models
-# 0 = none
-# 1 = Reynolds analogy
-# 2 = modified Van Driest
-# 3 = Deissler
-# 4 = Meier and Rotta
-EddyDiffusivityModel = 3
-BBoxMinSandGrainRoughness = 0.0 # [m] # 0.6e-3
-BBoxMaxSandGrainRoughness = 0.0 # [m] # 0
+[TimeManager]
+DtInitial = 5e-5 # [s]
+MaxTimeStepSize = 900 # [s]
+TEnd = 518400 # [s] # 518400 = 6 days
+EpisodeLength = 8e5 # [s] # 43200
+
+[Grid]
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.5 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.75 # [m]
+# Number of elements in x-, y-direction
+NumberOfCellsX = 20
+NumberOfCellsY = 40
+# Grading and refinement of the mesh
+GradingFactorY = 1.16
+RefineTopY = false
+# Position information
+NoDarcyX = 0.25 # [m] # Horizontal position without PM below
+RunUpDistanceX = 0.26 # [m] # Horizontal position without Coupling to PM
+InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
+
+[Output]
+NameFF = zeroeq2c
+NamePM = 2p2c
+# Frequency of restart file, flux and VTK output
+FreqRestart = 50            # 500  # how often restart files are written out
+FreqOutput = 5               #  10  # frequency of VTK output
+FreqMassOutput = 5           #  20  # frequency of mass and evaporation rate output (Darcy)
+
+[FreeFlow]
+RefVelocity = 3.5 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+
+[PorousMedium]
+RefPressurePM = 1e5 # [Pa]
+RefTemperaturePM = 298.15 # [K]
+RefSw = 0.9 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 6.9 # [-]
+
+# optional parameters
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 10
+MaxSteps = 15
+WriteConvergence = false
+
+[LinearSolver]
+Verbosity = 0
+
+[ZeroEq]
+# Eddy Viscosity Models
+# 0 = none
+# 1 = Prandtl
+# 2 = modified Van Driest
+# 3 = Baldwin Lomax
+EddyViscosityModel = 3
+# Eddy Diffusivity Models
+# 0 = none
+# 1 = Reynolds analogy
+# 2 = modified Van Driest
+# 3 = Deissler
+# 4 = Meier and Rotta
+EddyDiffusivityModel = 3
+BBoxMinSandGrainRoughness = 0.0 # [m] # 0.6e-3
+BBoxMaxSandGrainRoughness = 0.0 # [m] # 0
diff --git a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c_reference.input b/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c_reference.input
index 8500a7f85752a4aaed7c8a034e38015ea54fe67c..c545c0ecc55d55d560f164e606ecdac04e86b3ef 100644
--- a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c_reference.input
+++ b/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c_reference.input
@@ -1,77 +1,77 @@
-[TimeManager]
-DtInitial = 5e-5 # [s]
-MaxTimeStepSize = 900 # [s]
-TEnd = 86400 # [s]
-EpisodeLength = 8e5 # [s]
-
-[Grid]
-LowerLeftX = 0.0 # [m]
-UpperRightX = 0.5 # [m]
-LowerLeftY = 0.0 # [m]
-UpperRightY = 0.75 # [m]
-# Number of elements in x-, y-direction
-NumberOfCellsX = 10
-NumberOfCellsY = 25
-# Grading and refinement of the mesh
-GradingFactorY = 1.1
-RefineTopY = false
-# Position information
-NoDarcyX = 0.25 # [m] # Horizontal position without PM below
-RunUpDistanceX = 0.26 # [m] # Horizontal position without Coupling to PM
-InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
-
-[Output]
-NameFF = zeroeq2c
-NamePM = 2p2c
-# Frequency of restart file, flux and VTK output
-FreqRestart = 100            # 500  # how often restart files are written out
-FreqOutput = 5               #  10  # frequency of VTK output
-FreqMassOutput = 5           #  20  # frequency of mass and evaporation rate output (Darcy)
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-
-[PorousMedium]
-RefPressurePM = 1e5 # [Pa]
-RefTemperaturePM = 298.15 # [K]
-RefSw = 0.9 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-
-# optional parameters
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 10
-MaxSteps = 15
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
-
-[ZeroEq]
-# Eddy Viscosity Models
-# 0 = none
-# 1 = Prandtl
-# 2 = modified Van Driest
-# 3 = Baldwin Lomax
-EddyViscosityModel = 3
-# Eddy Diffusivity Models
-# 0 = none
-# 1 = Reynolds analogy
-# 2 = modified Van Driest
-# 3 = Deissler
-# 4 = Meier and Rotta
-EddyDiffusivityModel = 3
-BBoxMinSandGrainRoughness = 0.0 # [m] # 0.6e-3
-BBoxMaxSandGrainRoughness = 0.0 # [m] # 0
+[TimeManager]
+DtInitial = 5e-5 # [s]
+MaxTimeStepSize = 900 # [s]
+TEnd = 86400 # [s]
+EpisodeLength = 8e5 # [s]
+
+[Grid]
+LowerLeftX = 0.0 # [m]
+UpperRightX = 0.5 # [m]
+LowerLeftY = 0.0 # [m]
+UpperRightY = 0.75 # [m]
+# Number of elements in x-, y-direction
+NumberOfCellsX = 10
+NumberOfCellsY = 25
+# Grading and refinement of the mesh
+GradingFactorY = 1.1
+RefineTopY = false
+# Position information
+NoDarcyX = 0.25 # [m] # Horizontal position without PM below
+RunUpDistanceX = 0.26 # [m] # Horizontal position without Coupling to PM
+InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
+
+[Output]
+NameFF = zeroeq2c
+NamePM = 2p2c
+# Frequency of restart file, flux and VTK output
+FreqRestart = 100            # 500  # how often restart files are written out
+FreqOutput = 5               #  10  # frequency of VTK output
+FreqMassOutput = 5           #  20  # frequency of mass and evaporation rate output (Darcy)
+
+[FreeFlow]
+RefVelocity = 3.5 # [m/s]
+RefPressure = 1e5 # [Pa]
+RefMassfrac = 0.008 # [-]
+RefTemperature = 298.15 # [K]
+
+[PorousMedium]
+RefPressurePM = 1e5 # [Pa]
+RefTemperaturePM = 298.15 # [K]
+RefSw = 0.9 # [-]
+
+[SpatialParams]
+AlphaBJ = 1.0 # [-]
+Permeability = 2.65e-10 # [m^2]
+Porosity = 0.41 # [-]
+Swr = 0.005 # [-]
+Snr = 0.01 # [-]
+VgAlpha = 6.371e-4 # [1/Pa]
+VgN = 6.9 # [-]
+
+# optional parameters
+[Newton]
+MaxRelativeShift = 1e-5
+TargetSteps = 10
+MaxSteps = 15
+WriteConvergence = false
+MaxTimeStepDivisions = 20
+
+[LinearSolver]
+Verbosity = 0
+
+[ZeroEq]
+# Eddy Viscosity Models
+# 0 = none
+# 1 = Prandtl
+# 2 = modified Van Driest
+# 3 = Baldwin Lomax
+EddyViscosityModel = 3
+# Eddy Diffusivity Models
+# 0 = none
+# 1 = Reynolds analogy
+# 2 = modified Van Driest
+# 3 = Deissler
+# 4 = Meier and Rotta
+EddyDiffusivityModel = 3
+BBoxMinSandGrainRoughness = 0.0 # [m] # 0.6e-3
+BBoxMaxSandGrainRoughness = 0.0 # [m] # 0