diff --git a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
index 97e6d81e0a0e0415359fe0ce87f78f35d0f380b0..0b6ed737d8993937c8ade21b0b3a97c4a57116c3 100644
--- a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
@@ -27,6 +27,7 @@
 #include <math.h>
 
 #include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/implicit/cellcentered/mpfa/properties.hh>
 #include <dumux/porousmediumflow/1p/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/material/components/h2o.hh>
@@ -44,7 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(OnePNIConductionProblem, INHERITS_FROM(OnePNI));
 NEW_TYPE_TAG(OnePNIConductionBoxProblem, INHERITS_FROM(BoxModel, OnePNIConductionProblem));
 NEW_TYPE_TAG(OnePNIConductionCCProblem, INHERITS_FROM(CCTpfaModel, OnePNIConductionProblem));
-
+NEW_TYPE_TAG(OnePNIConductionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePNIConductionProblem));
 
 // Set the grid type
 SET_TYPE_PROP(OnePNIConductionProblem, Grid, Dune::YaspGrid<2>);
diff --git a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
index 5e0856b84800802707ab1861323bfd75e0de3440..8e7e1e5429448c37a44d8a9895d443a9e7e640ac 100644
--- a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
@@ -28,6 +28,7 @@
 #include <math.h>
 
 #include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/implicit/cellcentered/mpfa/properties.hh>
 #include <dumux/porousmediumflow/1p/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/material/components/h2o.hh>
@@ -46,6 +47,7 @@ namespace Properties
 NEW_TYPE_TAG(OnePNIConvectionProblem, INHERITS_FROM(OnePNI));
 NEW_TYPE_TAG(OnePNIConvectionBoxProblem, INHERITS_FROM(BoxModel, OnePNIConvectionProblem));
 NEW_TYPE_TAG(OnePNIConvectionCCProblem, INHERITS_FROM(CCTpfaModel, OnePNIConvectionProblem));
+NEW_TYPE_TAG(OnePNIConvectionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePNIConvectionProblem));
 
 // Set the grid type
 SET_TYPE_PROP(OnePNIConvectionProblem, Grid, Dune::YaspGrid<2>);
diff --git a/test/porousmediumflow/1p/implicit/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt
index f5efe6b3f13126e955fdf5cfb5c1eda20ec44c00..934cb447ba0951ef64dafb13914ae72f462b502c 100644
--- a/test/porousmediumflow/1p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/CMakeLists.txt
@@ -71,6 +71,20 @@ add_dumux_test(test_cc1pniconvection test_cc1pniconvection test_cc1pniconvection
                          ${CMAKE_CURRENT_BINARY_DIR}/cc1pniconvection-00010.vtu
                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pniconvection")
 
+add_dumux_test(test_ccmpfa1pniconduction test_ccmpfa1pniconduction test_ccmpfa1pniconduction.cc
+               python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+                 --script fuzzy
+                 --files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconduction-reference.vtu
+                         ${CMAKE_CURRENT_BINARY_DIR}/ccmpfa1pniconduction-00006.vtu
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpfa1pniconduction")
+
+add_dumux_test(test_ccmpfa1pniconvection test_ccmpfa1pniconvection test_ccmpfa1pniconvection.cc
+               python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+                 --script fuzzy
+                 --files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconvection-reference.vtu
+                         ${CMAKE_CURRENT_BINARY_DIR}/ccmpfa1pniconvection-00010.vtu
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpfa1pniconvection")
+
 # dim < dimWorld tests with foamgrid
 dune_add_test(SOURCES test_box1pnetwork1d3d.cc
               NAME test_box1pnetwork1d3d
@@ -94,7 +108,6 @@ add_dumux_test(test_cc1pfracture2d3d test_cc1pfracture2d3d test_cc1pfracture2d3d
                          ${CMAKE_CURRENT_BINARY_DIR}/1pccfracture2d3d-00001.vtu
                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pfracture2d3d")
 
-
 #install sources
 install(FILES
 1pniconductionproblem.hh
@@ -118,4 +131,6 @@ test_cc1p.cc
 test_cc1pniconduction.cc
 test_cc1pniconvection.cc
 test_cc1pwithamg.cc
+test_ccmpfa1pniconduction.cc
+test_ccmpfa1pniconvection.cc
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/1p)
diff --git a/test/references/ccmpfa1pniconduction-reference.vtu b/test/references/ccmpfa1pniconduction-reference.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..cb2cfeb34c6c57d2784d8305be1615b1696bc5a9
--- /dev/null
+++ b/test/references/ccmpfa1pniconduction-reference.vtu
@@ -0,0 +1,299 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
+  <UnstructuredGrid>
+    <Piece NumberOfCells="200" NumberOfPoints="402">
+      <CellData Scalars="p">
+        <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000
+        </DataArray>
+        <DataArray type="Float32" Name="process rank" 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
+          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="temperatureExact" NumberOfComponents="1" format="ascii">
+          299.723 299.171 298.623 298.082 297.549 297.028 296.521 296.029 295.555 295.099 294.664 294.25
+          293.859 293.49 293.145 292.823 292.524 292.248 291.994 291.762 291.55 291.359 291.186 291.031
+          290.892 290.769 290.66 290.564 290.48 290.407 290.344 290.289 290.242 290.201 290.167 290.138
+          290.113 290.093 290.076 290.061 290.05 290.04 290.032 290.025 290.02 290.016 290.013 290.01
+          290.008 290.006 290.005 290.004 290.003 290.002 290.002 290.001 290.001 290.001 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290
+        </DataArray>
+        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+          299.704 299.114 298.529 297.954 297.391 296.844 296.315 295.807 295.322 294.861 294.426 294.017
+          293.634 293.279 292.949 292.645 292.366 292.111 291.879 291.668 291.477 291.306 291.151 291.013
+          290.89 290.78 290.683 290.596 290.52 290.453 290.394 290.342 290.296 290.257 290.222 290.192
+          290.165 290.142 290.123 290.105 290.091 290.078 290.067 290.057 290.049 290.042 290.036 290.03
+          290.026 290.022 290.019 290.016 290.014 290.012 290.01 290.008 290.007 290.006 290.005 290.004
+          290.004 290.003 290.003 290.002 290.002 290.002 290.001 290.001 290.001 290.001 290.001 290.001
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290
+        </DataArray>
+      </CellData>
+      <Points>
+        <DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii">
+          0 0 0 0.025 0 0 0 1 0 0.025 1 0
+          0.05 0 0 0.05 1 0 0.075 0 0 0.075 1 0
+          0.1 0 0 0.1 1 0 0.125 0 0 0.125 1 0
+          0.15 0 0 0.15 1 0 0.175 0 0 0.175 1 0
+          0.2 0 0 0.2 1 0 0.225 0 0 0.225 1 0
+          0.25 0 0 0.25 1 0 0.275 0 0 0.275 1 0
+          0.3 0 0 0.3 1 0 0.325 0 0 0.325 1 0
+          0.35 0 0 0.35 1 0 0.375 0 0 0.375 1 0
+          0.4 0 0 0.4 1 0 0.425 0 0 0.425 1 0
+          0.45 0 0 0.45 1 0 0.475 0 0 0.475 1 0
+          0.5 0 0 0.5 1 0 0.525 0 0 0.525 1 0
+          0.55 0 0 0.55 1 0 0.575 0 0 0.575 1 0
+          0.6 0 0 0.6 1 0 0.625 0 0 0.625 1 0
+          0.65 0 0 0.65 1 0 0.675 0 0 0.675 1 0
+          0.7 0 0 0.7 1 0 0.725 0 0 0.725 1 0
+          0.75 0 0 0.75 1 0 0.775 0 0 0.775 1 0
+          0.8 0 0 0.8 1 0 0.825 0 0 0.825 1 0
+          0.85 0 0 0.85 1 0 0.875 0 0 0.875 1 0
+          0.9 0 0 0.9 1 0 0.925 0 0 0.925 1 0
+          0.95 0 0 0.95 1 0 0.975 0 0 0.975 1 0
+          1 0 0 1 1 0 1.025 0 0 1.025 1 0
+          1.05 0 0 1.05 1 0 1.075 0 0 1.075 1 0
+          1.1 0 0 1.1 1 0 1.125 0 0 1.125 1 0
+          1.15 0 0 1.15 1 0 1.175 0 0 1.175 1 0
+          1.2 0 0 1.2 1 0 1.225 0 0 1.225 1 0
+          1.25 0 0 1.25 1 0 1.275 0 0 1.275 1 0
+          1.3 0 0 1.3 1 0 1.325 0 0 1.325 1 0
+          1.35 0 0 1.35 1 0 1.375 0 0 1.375 1 0
+          1.4 0 0 1.4 1 0 1.425 0 0 1.425 1 0
+          1.45 0 0 1.45 1 0 1.475 0 0 1.475 1 0
+          1.5 0 0 1.5 1 0 1.525 0 0 1.525 1 0
+          1.55 0 0 1.55 1 0 1.575 0 0 1.575 1 0
+          1.6 0 0 1.6 1 0 1.625 0 0 1.625 1 0
+          1.65 0 0 1.65 1 0 1.675 0 0 1.675 1 0
+          1.7 0 0 1.7 1 0 1.725 0 0 1.725 1 0
+          1.75 0 0 1.75 1 0 1.775 0 0 1.775 1 0
+          1.8 0 0 1.8 1 0 1.825 0 0 1.825 1 0
+          1.85 0 0 1.85 1 0 1.875 0 0 1.875 1 0
+          1.9 0 0 1.9 1 0 1.925 0 0 1.925 1 0
+          1.95 0 0 1.95 1 0 1.975 0 0 1.975 1 0
+          2 0 0 2 1 0 2.025 0 0 2.025 1 0
+          2.05 0 0 2.05 1 0 2.075 0 0 2.075 1 0
+          2.1 0 0 2.1 1 0 2.125 0 0 2.125 1 0
+          2.15 0 0 2.15 1 0 2.175 0 0 2.175 1 0
+          2.2 0 0 2.2 1 0 2.225 0 0 2.225 1 0
+          2.25 0 0 2.25 1 0 2.275 0 0 2.275 1 0
+          2.3 0 0 2.3 1 0 2.325 0 0 2.325 1 0
+          2.35 0 0 2.35 1 0 2.375 0 0 2.375 1 0
+          2.4 0 0 2.4 1 0 2.425 0 0 2.425 1 0
+          2.45 0 0 2.45 1 0 2.475 0 0 2.475 1 0
+          2.5 0 0 2.5 1 0 2.525 0 0 2.525 1 0
+          2.55 0 0 2.55 1 0 2.575 0 0 2.575 1 0
+          2.6 0 0 2.6 1 0 2.625 0 0 2.625 1 0
+          2.65 0 0 2.65 1 0 2.675 0 0 2.675 1 0
+          2.7 0 0 2.7 1 0 2.725 0 0 2.725 1 0
+          2.75 0 0 2.75 1 0 2.775 0 0 2.775 1 0
+          2.8 0 0 2.8 1 0 2.825 0 0 2.825 1 0
+          2.85 0 0 2.85 1 0 2.875 0 0 2.875 1 0
+          2.9 0 0 2.9 1 0 2.925 0 0 2.925 1 0
+          2.95 0 0 2.95 1 0 2.975 0 0 2.975 1 0
+          3 0 0 3 1 0 3.025 0 0 3.025 1 0
+          3.05 0 0 3.05 1 0 3.075 0 0 3.075 1 0
+          3.1 0 0 3.1 1 0 3.125 0 0 3.125 1 0
+          3.15 0 0 3.15 1 0 3.175 0 0 3.175 1 0
+          3.2 0 0 3.2 1 0 3.225 0 0 3.225 1 0
+          3.25 0 0 3.25 1 0 3.275 0 0 3.275 1 0
+          3.3 0 0 3.3 1 0 3.325 0 0 3.325 1 0
+          3.35 0 0 3.35 1 0 3.375 0 0 3.375 1 0
+          3.4 0 0 3.4 1 0 3.425 0 0 3.425 1 0
+          3.45 0 0 3.45 1 0 3.475 0 0 3.475 1 0
+          3.5 0 0 3.5 1 0 3.525 0 0 3.525 1 0
+          3.55 0 0 3.55 1 0 3.575 0 0 3.575 1 0
+          3.6 0 0 3.6 1 0 3.625 0 0 3.625 1 0
+          3.65 0 0 3.65 1 0 3.675 0 0 3.675 1 0
+          3.7 0 0 3.7 1 0 3.725 0 0 3.725 1 0
+          3.75 0 0 3.75 1 0 3.775 0 0 3.775 1 0
+          3.8 0 0 3.8 1 0 3.825 0 0 3.825 1 0
+          3.85 0 0 3.85 1 0 3.875 0 0 3.875 1 0
+          3.9 0 0 3.9 1 0 3.925 0 0 3.925 1 0
+          3.95 0 0 3.95 1 0 3.975 0 0 3.975 1 0
+          4 0 0 4 1 0 4.025 0 0 4.025 1 0
+          4.05 0 0 4.05 1 0 4.075 0 0 4.075 1 0
+          4.1 0 0 4.1 1 0 4.125 0 0 4.125 1 0
+          4.15 0 0 4.15 1 0 4.175 0 0 4.175 1 0
+          4.2 0 0 4.2 1 0 4.225 0 0 4.225 1 0
+          4.25 0 0 4.25 1 0 4.275 0 0 4.275 1 0
+          4.3 0 0 4.3 1 0 4.325 0 0 4.325 1 0
+          4.35 0 0 4.35 1 0 4.375 0 0 4.375 1 0
+          4.4 0 0 4.4 1 0 4.425 0 0 4.425 1 0
+          4.45 0 0 4.45 1 0 4.475 0 0 4.475 1 0
+          4.5 0 0 4.5 1 0 4.525 0 0 4.525 1 0
+          4.55 0 0 4.55 1 0 4.575 0 0 4.575 1 0
+          4.6 0 0 4.6 1 0 4.625 0 0 4.625 1 0
+          4.65 0 0 4.65 1 0 4.675 0 0 4.675 1 0
+          4.7 0 0 4.7 1 0 4.725 0 0 4.725 1 0
+          4.75 0 0 4.75 1 0 4.775 0 0 4.775 1 0
+          4.8 0 0 4.8 1 0 4.825 0 0 4.825 1 0
+          4.85 0 0 4.85 1 0 4.875 0 0 4.875 1 0
+          4.9 0 0 4.9 1 0 4.925 0 0 4.925 1 0
+          4.95 0 0 4.95 1 0 4.975 0 0 4.975 1 0
+          5 0 0 5 1 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
+          60 62 63 61 62 64 65 63 64 66 67 65
+          66 68 69 67 68 70 71 69 70 72 73 71
+          72 74 75 73 74 76 77 75 76 78 79 77
+          78 80 81 79 80 82 83 81 82 84 85 83
+          84 86 87 85 86 88 89 87 88 90 91 89
+          90 92 93 91 92 94 95 93 94 96 97 95
+          96 98 99 97 98 100 101 99 100 102 103 101
+          102 104 105 103 104 106 107 105 106 108 109 107
+          108 110 111 109 110 112 113 111 112 114 115 113
+          114 116 117 115 116 118 119 117 118 120 121 119
+          120 122 123 121 122 124 125 123 124 126 127 125
+          126 128 129 127 128 130 131 129 130 132 133 131
+          132 134 135 133 134 136 137 135 136 138 139 137
+          138 140 141 139 140 142 143 141 142 144 145 143
+          144 146 147 145 146 148 149 147 148 150 151 149
+          150 152 153 151 152 154 155 153 154 156 157 155
+          156 158 159 157 158 160 161 159 160 162 163 161
+          162 164 165 163 164 166 167 165 166 168 169 167
+          168 170 171 169 170 172 173 171 172 174 175 173
+          174 176 177 175 176 178 179 177 178 180 181 179
+          180 182 183 181 182 184 185 183 184 186 187 185
+          186 188 189 187 188 190 191 189 190 192 193 191
+          192 194 195 193 194 196 197 195 196 198 199 197
+          198 200 201 199 200 202 203 201 202 204 205 203
+          204 206 207 205 206 208 209 207 208 210 211 209
+          210 212 213 211 212 214 215 213 214 216 217 215
+          216 218 219 217 218 220 221 219 220 222 223 221
+          222 224 225 223 224 226 227 225 226 228 229 227
+          228 230 231 229 230 232 233 231 232 234 235 233
+          234 236 237 235 236 238 239 237 238 240 241 239
+          240 242 243 241 242 244 245 243 244 246 247 245
+          246 248 249 247 248 250 251 249 250 252 253 251
+          252 254 255 253 254 256 257 255 256 258 259 257
+          258 260 261 259 260 262 263 261 262 264 265 263
+          264 266 267 265 266 268 269 267 268 270 271 269
+          270 272 273 271 272 274 275 273 274 276 277 275
+          276 278 279 277 278 280 281 279 280 282 283 281
+          282 284 285 283 284 286 287 285 286 288 289 287
+          288 290 291 289 290 292 293 291 292 294 295 293
+          294 296 297 295 296 298 299 297 298 300 301 299
+          300 302 303 301 302 304 305 303 304 306 307 305
+          306 308 309 307 308 310 311 309 310 312 313 311
+          312 314 315 313 314 316 317 315 316 318 319 317
+          318 320 321 319 320 322 323 321 322 324 325 323
+          324 326 327 325 326 328 329 327 328 330 331 329
+          330 332 333 331 332 334 335 333 334 336 337 335
+          336 338 339 337 338 340 341 339 340 342 343 341
+          342 344 345 343 344 346 347 345 346 348 349 347
+          348 350 351 349 350 352 353 351 352 354 355 353
+          354 356 357 355 356 358 359 357 358 360 361 359
+          360 362 363 361 362 364 365 363 364 366 367 365
+          366 368 369 367 368 370 371 369 370 372 373 371
+          372 374 375 373 374 376 377 375 376 378 379 377
+          378 380 381 379 380 382 383 381 382 384 385 383
+          384 386 387 385 386 388 389 387 388 390 391 389
+          390 392 393 391 392 394 395 393 394 396 397 395
+          396 398 399 397 398 400 401 399
+        </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
+          724 728 732 736 740 744 748 752 756 760 764 768
+          772 776 780 784 788 792 796 800
+        </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
+          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/references/ccmpfa1pniconvection-reference.vtu b/test/references/ccmpfa1pniconvection-reference.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..6f0c43cb57ac7fadfbb16ebb57d4232d19f732d9
--- /dev/null
+++ b/test/references/ccmpfa1pniconvection-reference.vtu
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
+  <UnstructuredGrid>
+    <Piece NumberOfCells="80" NumberOfPoints="162">
+      <CellData Scalars="p">
+        <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
+          121429 121165 120901 120637 120373 120108 119844 119580 119316 119052 118788 118524
+          118259 117994 117729 117463 117196 116928 116659 116390 116120 115850 115580 115309
+          115038 114767 114497 114226 113955 113684 113413 113142 112871 112600 112329 112058
+          111787 111516 111245 110974 110703 110432 110161 109890 109619 109348 109077 108806
+          108535 108264 107994 107723 107452 107181 106910 106639 106368 106097 105826 105555
+          105284 105013 104742 104471 104200 103929 103658 103387 103116 102845 102574 102303
+          102032 101761 101490 101219 100948 100677 100406 100135
+        </DataArray>
+        <DataArray type="Float32" Name="process rank" 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
+        </DataArray>
+        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+          291 291 291 291.001 291.002 291 290.997 290.998 291.005 291.014 291.014 290.994
+          290.943 290.861 290.754 290.632 290.508 290.392 290.291 290.208 290.144 290.096 290.063 290.04
+          290.025 290.015 290.009 290.006 290.004 290.003 290.002 290.002 290.001 290.001 290.001 290.001
+          290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
+          290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
+          290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
+          290.001 290.001 290.001 290.002 290.001 290.002 290 290.002
+        </DataArray>
+        <DataArray type="Float32" Name="temperatureExact" NumberOfComponents="1" format="ascii">
+          291 291 291 291 291 291 291 291 291 291 291 291
+          291 291 291 291 291 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290 290 290 290 290
+          290 290 290 290 290 290 290 290
+        </DataArray>
+      </CellData>
+      <Points>
+        <DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii">
+          0 0 0 0.25 0 0 0 1 0 0.25 1 0
+          0.5 0 0 0.5 1 0 0.75 0 0 0.75 1 0
+          1 0 0 1 1 0 1.25 0 0 1.25 1 0
+          1.5 0 0 1.5 1 0 1.75 0 0 1.75 1 0
+          2 0 0 2 1 0 2.25 0 0 2.25 1 0
+          2.5 0 0 2.5 1 0 2.75 0 0 2.75 1 0
+          3 0 0 3 1 0 3.25 0 0 3.25 1 0
+          3.5 0 0 3.5 1 0 3.75 0 0 3.75 1 0
+          4 0 0 4 1 0 4.25 0 0 4.25 1 0
+          4.5 0 0 4.5 1 0 4.75 0 0 4.75 1 0
+          5 0 0 5 1 0 5.25 0 0 5.25 1 0
+          5.5 0 0 5.5 1 0 5.75 0 0 5.75 1 0
+          6 0 0 6 1 0 6.25 0 0 6.25 1 0
+          6.5 0 0 6.5 1 0 6.75 0 0 6.75 1 0
+          7 0 0 7 1 0 7.25 0 0 7.25 1 0
+          7.5 0 0 7.5 1 0 7.75 0 0 7.75 1 0
+          8 0 0 8 1 0 8.25 0 0 8.25 1 0
+          8.5 0 0 8.5 1 0 8.75 0 0 8.75 1 0
+          9 0 0 9 1 0 9.25 0 0 9.25 1 0
+          9.5 0 0 9.5 1 0 9.75 0 0 9.75 1 0
+          10 0 0 10 1 0 10.25 0 0 10.25 1 0
+          10.5 0 0 10.5 1 0 10.75 0 0 10.75 1 0
+          11 0 0 11 1 0 11.25 0 0 11.25 1 0
+          11.5 0 0 11.5 1 0 11.75 0 0 11.75 1 0
+          12 0 0 12 1 0 12.25 0 0 12.25 1 0
+          12.5 0 0 12.5 1 0 12.75 0 0 12.75 1 0
+          13 0 0 13 1 0 13.25 0 0 13.25 1 0
+          13.5 0 0 13.5 1 0 13.75 0 0 13.75 1 0
+          14 0 0 14 1 0 14.25 0 0 14.25 1 0
+          14.5 0 0 14.5 1 0 14.75 0 0 14.75 1 0
+          15 0 0 15 1 0 15.25 0 0 15.25 1 0
+          15.5 0 0 15.5 1 0 15.75 0 0 15.75 1 0
+          16 0 0 16 1 0 16.25 0 0 16.25 1 0
+          16.5 0 0 16.5 1 0 16.75 0 0 16.75 1 0
+          17 0 0 17 1 0 17.25 0 0 17.25 1 0
+          17.5 0 0 17.5 1 0 17.75 0 0 17.75 1 0
+          18 0 0 18 1 0 18.25 0 0 18.25 1 0
+          18.5 0 0 18.5 1 0 18.75 0 0 18.75 1 0
+          19 0 0 19 1 0 19.25 0 0 19.25 1 0
+          19.5 0 0 19.5 1 0 19.75 0 0 19.75 1 0
+          20 0 0 20 1 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
+          60 62 63 61 62 64 65 63 64 66 67 65
+          66 68 69 67 68 70 71 69 70 72 73 71
+          72 74 75 73 74 76 77 75 76 78 79 77
+          78 80 81 79 80 82 83 81 82 84 85 83
+          84 86 87 85 86 88 89 87 88 90 91 89
+          90 92 93 91 92 94 95 93 94 96 97 95
+          96 98 99 97 98 100 101 99 100 102 103 101
+          102 104 105 103 104 106 107 105 106 108 109 107
+          108 110 111 109 110 112 113 111 112 114 115 113
+          114 116 117 115 116 118 119 117 118 120 121 119
+          120 122 123 121 122 124 125 123 124 126 127 125
+          126 128 129 127 128 130 131 129 130 132 133 131
+          132 134 135 133 134 136 137 135 136 138 139 137
+          138 140 141 139 140 142 143 141 142 144 145 143
+          144 146 147 145 146 148 149 147 148 150 151 149
+          150 152 153 151 152 154 155 153 154 156 157 155
+          156 158 159 157 158 160 161 159
+        </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
+        </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
+        </DataArray>
+      </Cells>
+    </Piece>
+  </UnstructuredGrid>
+</VTKFile>