diff --git a/test/porousmediumflow/sequential/2p/CMakeLists.txt b/test/porousmediumflow/sequential/2p/CMakeLists.txt
index 958eaa3fa784da02abc93b2fce9cc26895199fec..c08eacabd47cb91bcad00b2e846fc822cae5d7c5 100644
--- a/test/porousmediumflow/sequential/2p/CMakeLists.txt
+++ b/test/porousmediumflow/sequential/2p/CMakeLists.txt
@@ -89,6 +89,28 @@ dumux_add_test(NAME test_mpfal2padaptive
                                ${CMAKE_CURRENT_BINARY_DIR}/test_mpfal2padaptive-00006.vtu
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfa2p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_mpfa2p.input -Problem.Name test_mpfal2padaptive -ModelType MPFALAdaptive")
 
+dumux_add_test(NAME test_mpfal2p_bcleverett
+              SOURCES test_mpfa2p.cc
+              COMPILE_DEFINITIONS PROBLEM=0
+              LABELS porousmediumflow 2p sequential
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS  --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfal2p_bcleverett
+                                   -ParameterFile test_mpfa2p.input
+                                   -Problem.Name test_mpfal2p_bcleverett
+                                   -Problem.EnableGravity false
+                                   -Grid.File grids/test_mpfa2p.dgf -ModelType MPFAL")
+
+dumux_add_test(NAME test_mpfao2p_mcwhorter
+              SOURCES test_mpfa2p.cc
+              COMPILE_DEFINITIONS PROBLEM=1
+              LABELS porousmediumflow 2p sequential
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS  --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfao2p_mcwhorter
+                                   -ParameterFile test_mpfa2p.input
+                                   -Problem.Name test_mpfao2p_mcwhorter
+                                   -Problem.EnableGravity false
+                                   -Grid.File grids/test_mpfa2p.dgf -ModelType MPFAO")
+
 # 3d tests
 dumux_add_test(NAME test_3d2pfv
               LABELS porousmediumflow 2p sequential
diff --git a/test/porousmediumflow/sequential/2p/buckleyleverettanalyticsolution.hh b/test/porousmediumflow/sequential/2p/buckleyleverettanalyticsolution.hh
index e54f31ba0df2f2ac8b226e1e35b7d7a21fc00515..a80162132bc36e209896a9523b63de69fa31123b 100644
--- a/test/porousmediumflow/sequential/2p/buckleyleverettanalyticsolution.hh
+++ b/test/porousmediumflow/sequential/2p/buckleyleverettanalyticsolution.hh
@@ -87,10 +87,10 @@ private:
     void prepareAnalytic()
     {
         const auto& dummyElement = *problem_.gridView().template begin<0>();
-        const auto& fluidMatrixInteraction = problem_->spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
+        const auto& fluidMatrixInteraction = problem_.spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
 
-        swr_ = fluidMatrixInteraction.effToAbsParams().swr();
-        snr_ = fluidMatrixInteraction.effToAbsParams().snr();
+        swr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().swr();
+        snr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().snr();
         Scalar porosity = problem_.spatialParams().porosity(dummyElement);
 
         FluidState fluidState;
diff --git a/test/porousmediumflow/sequential/2p/mcwhorteranalyticsolution.hh b/test/porousmediumflow/sequential/2p/mcwhorteranalyticsolution.hh
index 79bf0974a9eb06235cc6d1e4631bd92f1718845e..1c608c4b080f5664f1755aa285f2c896cd916c2a 100644
--- a/test/porousmediumflow/sequential/2p/mcwhorteranalyticsolution.hh
+++ b/test/porousmediumflow/sequential/2p/mcwhorteranalyticsolution.hh
@@ -131,10 +131,10 @@ private:
     void prepareAnalytic()
     {
         const auto& dummyElement = *problem_.gridView().template begin<0>();
-        const auto& fluidMatrixInteraction = problem_->spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
+        const auto& fluidMatrixInteraction = problem_.spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
 
-        swr_ = fluidMatrixInteraction.effToAbsParams().swr();
-        snr_ = fluidMatrixInteraction.effToAbsParams().snr();
+        swr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().swr();
+        snr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().snr();
         porosity_ = problem_.spatialParams().porosity(dummyElement);
         permeability_ = problem_.spatialParams().intrinsicPermeability(dummyElement)[0][0];
         PrimaryVariables initVec;
diff --git a/test/porousmediumflow/sequential/2p/test_mpfa2p.cc b/test/porousmediumflow/sequential/2p/test_mpfa2p.cc
index 8b79a207fe89d6502e7e6ab38961ada2222cd042..81cf917467629521360d2f0fbdd95996e4ab2ff0 100644
--- a/test/porousmediumflow/sequential/2p/test_mpfa2p.cc
+++ b/test/porousmediumflow/sequential/2p/test_mpfa2p.cc
@@ -19,7 +19,9 @@
  *
  * \brief Test for the sequential 2p models
  */
+#ifndef PROBLEM
 #define PROBLEM 2 // 0 = Buckley-Leverett, 1 = McWhorter, 2 = 2D Lense problem
+#endif
 
 #include <config.h>