diff --git a/test/porousmediumflow/richards/implicit/CMakeLists.txt b/test/porousmediumflow/richards/implicit/CMakeLists.txt
index 80f797fe438273e9bff0eb9b3c5617c889350338..c8564e2962879c97f542105457cccb0a65a9fbcb 100644
--- a/test/porousmediumflow/richards/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/CMakeLists.txt
@@ -1,187 +1,3 @@
-add_input_file_links()
-
-# isothermal tests
-add_executable(test_richards_tpfa EXCLUDE_FROM_ALL test_richardslens_fv.cc)
-target_compile_definitions(test_richards_tpfa PUBLIC TYPETAG=RichardsLensCC)
-
-add_executable(test_richards_box EXCLUDE_FROM_ALL test_richardslens_fv.cc)
-target_compile_definitions(test_richards_box PUBLIC TYPETAG=RichardsLensBox)
-
-dune_add_test(TARGET test_richards_box
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box-00007.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_box test_richardslens.input -Problem.Name test_richards_box")
-
-dune_add_test(TARGET test_richards_tpfa
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa-00007.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa test_richardslens.input -Problem.Name test_richards_tpfa")
-
-dune_add_test(NAME test_richards_box_parallel_yasp
-              TARGET test_richards_box
-              CMAKE_GUARD MPI_FOUND
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference-parallel.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_box_parallel_yasp-00007.vtu
-                               ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_box_parallel_yasp-00007.pvtu
-                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box test_richardslens.input -Problem.Name test_richards_box_parallel_yasp -Grid.Overlap 0")
-
-dune_add_test(NAME test_richards_tpfa_parallel_yasp
-              TARGET test_richards_tpfa
-              CMAKE_GUARD MPI_FOUND
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
-                      --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference-parallel.vtu
-                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_tpfa_parallel_yasp-00007.vtu
-                              ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu
-                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_yasp-00007.pvtu
-                      --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa test_richardslens.input -Problem.Name test_richards_tpfa_parallel_yasp -Grid.Overlap 1")
-
-# TODO: there is a small difference because of the precision loss when writing and reading to and from vtk with single precision
-# This is why we need a bit higher saturation threshold since pc-sw is very sensitive to pressure for saturations close to 0
-dune_add_test(NAME test_richards_tpfa_parallel_yasp_restart
-              TARGET test_richards_tpfa
-              CMAKE_GUARD MPI_FOUND
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_liq":1e-3,"water content":1e-3}
-                      --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference-parallel.vtu
-                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_tpfa_parallel_yasp_restart-00004.vtu
-                              ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu
-                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_yasp_restart-00004.pvtu
-                      --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa test_richardslens.input -Problem.Name test_richards_tpfa_parallel_yasp_restart -Grid.Overlap 1 -Restart.Time 536.797 -Restart.File s0002-test_richards_tpfa_parallel_yasp-00003.pvtu -TimeLoop.DtInitial 408.68")
-
-# the restart test has to run after the test that produces the corresponding vtu file
-set_tests_properties(test_richards_tpfa_parallel_yasp_restart PROPERTIES DEPENDS test_richards_tpfa_parallel_yasp)
-
-dune_add_test(NAME test_richards_box_parallel_ug
-              SOURCES test_richardslens_fv.cc
-              CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
-              COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::UGGrid<2>
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_box_parallel_ug-00007.pvtu
-                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box_parallel_ug test_richardslens.input -Problem.Name test_richards_box_parallel_ug")
-
-dune_add_test(NAME test_richards_tpfa_parallel_ug
-              SOURCES test_richardslens_fv.cc
-              CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
-              COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::UGGrid<2>
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_ug-00007.pvtu
-                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa_parallel_ug test_richardslens.input -Problem.Name test_richards_tpfa_parallel_ug")
-
-dune_add_test(NAME test_richards_box_parallel_alu
-              SOURCES test_richardslens_fv.cc
-              CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
-              COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_box_parallel_alu-00007.pvtu
-                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box_parallel_alu test_richardslens.input -Problem.Name test_richards_box_parallel_alu")
-
-dune_add_test(NAME test_richards_tpfa_parallel_alu
-              SOURCES test_richardslens_fv.cc
-              CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
-              COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_alu-00007.pvtu
-                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa_parallel_alu test_richardslens.input -Problem.Name test_richards_tpfa_parallel_alu")
-
-# comparison to analytical solution - only with cc
-dune_add_test(SOURCES test_ccrichardsanalytical.cc
-              NAME test_ccrichardsanalytical
-              COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCC
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardsanalyticalcc-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsanalytical-00001.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsanalytical test_ccrichardsanalytical.input -Problem.Name test_ccrichardsanalytical")
-# non-isothermal tests
-dune_add_test(SOURCES test_richardsniconvection_fv.cc
-              NAME test_boxrichardsniconvection
-              COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBox
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconvectionbox-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconvection-00044.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconvection test_richardsniconvection.input -Problem.Name test_boxrichardsniconvection"
-                      )
-
-dune_add_test(SOURCES test_richardsniconvection_fv.cc
-              NAME test_ccrichardsniconvection
-              COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCC
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconvectioncc-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconvection-00043.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconvection test_richardsniconvection.input -Problem.Name test_ccrichardsniconvection")
-
-dune_add_test(SOURCES test_richardsniconduction_fv.cc
-              NAME test_boxrichardsniconduction
-              COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBox
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconductionbox-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconduction-00024.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconduction test_richardsniconduction.input -Problem.Name test_boxrichardsniconduction"
-                        )
-
-dune_add_test(SOURCES test_richardsniconduction_fv.cc
-              NAME test_ccrichardsniconduction
-              COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCC
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconductioncc-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconduction-00024.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconduction test_richardsniconduction.input -Problem.Name test_ccrichardsniconduction"
-                      )
-
-dune_add_test(SOURCES test_richardsnievaporation_fv.cc
-              NAME test_richardsnievaporation_tpfa
-              COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationCC
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/test_ccrichardsevaporation-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsnievaporation-00043.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnievaporation_tpfa test_richardsnievaporation.input -Problem.Name test_ccrichardsnievaporation"
-                      )
-
-dune_add_test(SOURCES test_richardsnievaporation_fv.cc
-              NAME test_richardsnievaporation_box
-              COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationBox
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/test_boxrichardsevaporation-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsnievaporation-00043.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnievaporation_box test_richardsnievaporation.input -Problem.Name test_boxrichardsnievaporation"
-                      )
-
-
-#install sources
-install(FILES
-richardsanalyticalproblem.hh
-richardsanalyticalspatialparams.hh
-richardslensproblem.hh
-richardslensspatialparams.hh
-richardsniconductionproblem.hh
-richardsniconvectionproblem.hh
-richardsnievaporationproblem.hh
-richardsnispatialparams.hh
-test_richardslens_fv.cc
-test_richardsniconduction_fv.cc
-test_richardsniconvection_fv.cc
-test_richardsnievaporation_fv.cc
-test_ccrichardsanalytical.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards)
+add_subdirectory(analytical)
+add_subdirectory(lens)
+add_subdirectory(nonisothermal)
diff --git a/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..741eea2d02487f21f744974ec038ef537dd413cd
--- /dev/null
+++ b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt
@@ -0,0 +1,18 @@
+add_input_file_links(FILES params.input)
+
+# comparison to analytical solution - only with tpfa
+dune_add_test(NAME test_richards_analytical_tpfa
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCC
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_analytical_tpfa-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richards_analytical_tpfa-00001.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_analytical_tpfa params.input -Problem.Name test_richards_analytical_tpfa")
+
+#install sources
+install(FILES
+problem.hh
+spatialparams.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/analytical)
diff --git a/test/porousmediumflow/richards/implicit/RichardsAnalytical.m b/test/porousmediumflow/richards/implicit/analytical/RichardsAnalytical.m
similarity index 100%
rename from test/porousmediumflow/richards/implicit/RichardsAnalytical.m
rename to test/porousmediumflow/richards/implicit/analytical/RichardsAnalytical.m
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc b/test/porousmediumflow/richards/implicit/analytical/main.cc
similarity index 99%
rename from test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
rename to test/porousmediumflow/richards/implicit/analytical/main.cc
index c9b942d261256c02b47b82e70910e310a3de7c11..8c048ec2ddf146eed1c702d1eec11a8051e16c19 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
+++ b/test/porousmediumflow/richards/implicit/analytical/main.cc
@@ -23,7 +23,7 @@
  */
 #include <config.h>
 
-#include "richardsanalyticalproblem.hh"
+#include "problem.hh"
 
 #include <ctime>
 #include <iostream>
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input b/test/porousmediumflow/richards/implicit/analytical/params.input
similarity index 100%
rename from test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input
rename to test/porousmediumflow/richards/implicit/analytical/params.input
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/analytical/problem.hh
similarity index 99%
rename from test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
rename to test/porousmediumflow/richards/implicit/analytical/problem.hh
index acef90639fd6a55a762089d0e24f6ddee3ed8c0a..9a13cdba624f85a1482d5d701921a43d39bc737a 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
+++ b/test/porousmediumflow/richards/implicit/analytical/problem.hh
@@ -40,7 +40,7 @@
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
-#include "richardsanalyticalspatialparams.hh"
+#include "spatialparams.hh"
 
 namespace Dumux {
 
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
rename to test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
diff --git a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..aa2be73b0cddf643c5d9a94279f7c4f2b08c6498
--- /dev/null
+++ b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
@@ -0,0 +1,107 @@
+add_input_file_links(FILES params.input)
+
+# isothermal tests
+add_executable(test_richards_lens_tpfa EXCLUDE_FROM_ALL main.cc)
+target_compile_definitions(test_richards_lens_tpfa PUBLIC TYPETAG=RichardsLensCC)
+
+add_executable(test_richards_lens_box EXCLUDE_FROM_ALL main.cc)
+target_compile_definitions(test_richards_lens_box PUBLIC TYPETAG=RichardsLensBox)
+
+dune_add_test(TARGET test_richards_lens_box
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box-00007.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box params.input -Problem.Name test_richards_lens_box")
+
+dune_add_test(TARGET test_richards_lens_tpfa
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa-00007.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa")
+
+dune_add_test(NAME test_richards_lens_box_parallel_yasp
+              TARGET test_richards_lens_box
+              CMAKE_GUARD MPI_FOUND
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box_parallel-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_lens_box_parallel_yasp-00007.vtu
+                               ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_yasp-00007.pvtu
+                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box params.input -Problem.Name test_richards_lens_box_parallel_yasp -Grid.Overlap 0")
+
+dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp
+              TARGET test_richards_lens_tpfa
+              CMAKE_GUARD MPI_FOUND
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
+                      --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa_parallel-reference.vtu
+                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_lens_tpfa_parallel_yasp-00007.vtu
+                              ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu
+                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_yasp-00007.pvtu
+                      --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa_parallel_yasp -Grid.Overlap 1")
+
+# TODO: there is a small difference because of the precision loss when writing and reading to and from vtk with single precision
+# This is why we need a bit higher saturation threshold since pc-sw is very sensitive to pressure for saturations close to 0
+dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart
+              TARGET test_richards_lens_tpfa
+              CMAKE_GUARD MPI_FOUND
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_liq":1e-3,"water content":1e-3}
+                      --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa_parallel-reference.vtu
+                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_lens_tpfa_parallel_yasp_restart-00004.vtu
+                              ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu
+                              ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_yasp_restart-00004.pvtu
+                      --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa_parallel_yasp_restart -Grid.Overlap 1 -Restart.Time 536.797 -Restart.File s0002-test_richards_lens_tpfa_parallel_yasp-00003.pvtu -TimeLoop.DtInitial 408.68")
+
+# the restart test has to run after the test that produces the corresponding vtu file
+set_tests_properties(test_richards_lens_tpfa_parallel_yasp_restart PROPERTIES DEPENDS test_richards_lens_tpfa_parallel_yasp)
+
+dune_add_test(NAME test_richards_lens_box_parallel_ug
+              SOURCES main.cc
+              CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
+              COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::UGGrid<2>
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_ug-00007.pvtu
+                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_ug params.input -Problem.Name test_richards_lens_box_parallel_ug")
+
+dune_add_test(NAME test_richards_lens_tpfa_parallel_ug
+              SOURCES main.cc
+              CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
+              COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::UGGrid<2>
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_ug-00007.pvtu
+                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_parallel_ug params.input -Problem.Name test_richards_lens_tpfa_parallel_ug")
+
+dune_add_test(NAME test_richards_lens_box_parallel_alu
+              SOURCES main.cc
+              CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
+              COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_alu-00007.pvtu
+                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_alu params.input -Problem.Name test_richards_lens_box_parallel_alu")
+
+dune_add_test(NAME test_richards_lens_tpfa_parallel_alu
+              SOURCES main.cc
+              CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
+              COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_alu-00007.pvtu
+                       --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_parallel_alu params.input -Problem.Name test_richards_lens_tpfa_parallel_alu")
+
+#install sources
+install(FILES
+problem.hh
+spatialparams.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/lens)
diff --git a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc b/test/porousmediumflow/richards/implicit/lens/main.cc
similarity index 99%
rename from test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
rename to test/porousmediumflow/richards/implicit/lens/main.cc
index dc48aebad51945bb33f2d451cd9f378e47a8cb9f..cfca7cc7c545a8025ae727c6a11b70b6f1753acf 100644
--- a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
+++ b/test/porousmediumflow/richards/implicit/lens/main.cc
@@ -47,7 +47,7 @@
 #include <dumux/io/grid/gridmanager.hh>
 #include <dumux/io/loadsolution.hh>
 
-#include "richardslensproblem.hh"
+#include "problem.hh"
 
 ////////////////////////
 // the main function
diff --git a/test/porousmediumflow/richards/implicit/test_richardslens.input b/test/porousmediumflow/richards/implicit/lens/params.input
similarity index 100%
rename from test/porousmediumflow/richards/implicit/test_richardslens.input
rename to test/porousmediumflow/richards/implicit/lens/params.input
diff --git a/test/porousmediumflow/richards/implicit/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/lens/problem.hh
similarity index 99%
rename from test/porousmediumflow/richards/implicit/richardslensproblem.hh
rename to test/porousmediumflow/richards/implicit/lens/problem.hh
index 68c601f4121849385d5a0061b42616fc8f8fc75c..253fddd7988e8e4a89bb20da8be311a451816309 100644
--- a/test/porousmediumflow/richards/implicit/richardslensproblem.hh
+++ b/test/porousmediumflow/richards/implicit/lens/problem.hh
@@ -42,7 +42,7 @@
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
-#include "richardslensspatialparams.hh"
+#include "spatialparams.hh"
 
 namespace Dumux {
 
diff --git a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
rename to test/porousmediumflow/richards/implicit/lens/spatialparams.hh
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d38897000d87137197a3cf9bddc0222f09a7e8b1
--- /dev/null
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory(conduction)
+add_subdirectory(convection)
+add_subdirectory(evaporation)
+
+#install sources
+install(FILES
+spatialparams.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal)
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5aeb30cccaf984280f18402b717d89153fdafc0a
--- /dev/null
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt
@@ -0,0 +1,28 @@
+add_input_file_links(FILES params.input)
+
+# non-isothermal tests
+dune_add_test(NAME test_richardsni_conduction_box
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBox
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_conduction_box-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_box-00024.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_box params.input -Problem.Name test_richardsni_conduction_box"
+                        )
+
+dune_add_test(NAME test_richardsni_conduction_tpfa
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCC
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_conduction_tpfa-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_tpfa-00024.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_tpfa params.input -Problem.Name test_richardsni_conduction_tpfa"
+                      )
+
+#install sources
+install(FILES
+problem.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal/conduction)
diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc
similarity index 99%
rename from test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc
rename to test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc
index 04cc3790ee8ae9ec405b79140cf3c206884e3ff8..5c87ef156440e7c018c066684ee2f14181d56a7a 100644
--- a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc
@@ -23,7 +23,7 @@
  */
 #include <config.h>
 
-#include "richardsniconvectionproblem.hh"
+#include "problem.hh"
 
 #include <ctime>
 #include <iostream>
diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconduction.input b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/params.input
similarity index 100%
rename from test/porousmediumflow/richards/implicit/test_richardsniconduction.input
rename to test/porousmediumflow/richards/implicit/nonisothermal/conduction/params.input
diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
similarity index 99%
rename from test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
rename to test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
index 9cffd77bec3fd2bb67954bceb3099b85fa90c484..b2d3a1f097b9104ffa72416624f7218b99c1e305 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
@@ -36,7 +36,7 @@
 #include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
-#include "richardsnispatialparams.hh"
+#include "../spatialparams.hh"
 
 namespace Dumux {
 
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..32568736cf0cedb9ef405e23b4949921c7da68ff
--- /dev/null
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt
@@ -0,0 +1,27 @@
+add_input_file_links(FILES params.input)
+
+# non-isothermal tests
+dune_add_test(NAME test_richardsni_convection_box
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBox
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_convection_box-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_box-00044.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_box params.input -Problem.Name test_richardsni_convection_box"
+                      )
+
+dune_add_test(NAME test_richardsni_convection_tpfa
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCC
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_convection_tpfa-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_tpfa-00043.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_tpfa params.input -Problem.Name test_richardsni_convection_tpfa")
+
+#install sources
+install(FILES
+problem.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal/convection)
diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc
similarity index 99%
rename from test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc
rename to test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc
index 056beb23ebcd35e7174d14f1f4e62f1b656a722b..5c87ef156440e7c018c066684ee2f14181d56a7a 100644
--- a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc
@@ -23,7 +23,7 @@
  */
 #include <config.h>
 
-#include "richardsniconductionproblem.hh"
+#include "problem.hh"
 
 #include <ctime>
 #include <iostream>
diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconvection.input b/test/porousmediumflow/richards/implicit/nonisothermal/convection/params.input
similarity index 100%
rename from test/porousmediumflow/richards/implicit/test_richardsniconvection.input
rename to test/porousmediumflow/richards/implicit/nonisothermal/convection/params.input
diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
similarity index 99%
rename from test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
rename to test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
index 532f64f4b0b679d137dd9e9458498e4a441f5115..a70b9c0df53915a056cb36b17f017646f063d9dd 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
@@ -37,7 +37,7 @@
 #include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
-#include "richardsnispatialparams.hh"
+#include "../spatialparams.hh"
 
 namespace Dumux {
 /**
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..71c29289c7024021915146bb91289c76880db943
--- /dev/null
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt
@@ -0,0 +1,28 @@
+add_input_file_links(FILES params.input)
+
+# non-isothermal tests
+dune_add_test(NAME test_richardsni_evaporation_tpfa
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationCC
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_evaporation_tpfa-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_tpfa-00043.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_tpfa params.input -Problem.Name test_richardsni_evaporation_tpfa"
+                      )
+
+dune_add_test(NAME test_richardsni_evaporation_box
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationBox
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_evaporation_box-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_box-00043.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_box params.input -Problem.Name test_richardsni_evaporation_box"
+                      )
+
+#install sources
+install(FILES
+problem.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal/evaporation)
diff --git a/test/porousmediumflow/richards/implicit/test_richardsnievaporation_fv.cc b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc
similarity index 99%
rename from test/porousmediumflow/richards/implicit/test_richardsnievaporation_fv.cc
rename to test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc
index e44007b65e56582a1327136f0727ae775aef28e6..9fe53abe8f8e1883ea2eda113c03a21d92713633 100644
--- a/test/porousmediumflow/richards/implicit/test_richardsnievaporation_fv.cc
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc
@@ -23,7 +23,7 @@
  */
 #include <config.h>
 
-#include "richardsnievaporationproblem.hh"
+#include "problem.hh"
 
 #include <ctime>
 #include <iostream>
diff --git a/test/porousmediumflow/richards/implicit/test_richardsnievaporation.input b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/params.input
similarity index 100%
rename from test/porousmediumflow/richards/implicit/test_richardsnievaporation.input
rename to test/porousmediumflow/richards/implicit/nonisothermal/evaporation/params.input
diff --git a/test/porousmediumflow/richards/implicit/richardsnievaporationproblem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
similarity index 99%
rename from test/porousmediumflow/richards/implicit/richardsnievaporationproblem.hh
rename to test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
index 037d5c0ccb1f0a26d0f6409a710b2d673a9ddde9..fb110fa8182d0d854f733ac58bf822bbf2f5ec8b 100644
--- a/test/porousmediumflow/richards/implicit/richardsnievaporationproblem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
@@ -36,7 +36,7 @@
 #include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
-#include "richardsnispatialparams.hh"
+#include "../spatialparams.hh"
 
 namespace Dumux {
 
diff --git a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
rename to test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
diff --git a/test/references/richardsanalyticalcc-reference.vtu b/test/references/test_richards_analytical_tpfa-reference.vtu
similarity index 100%
rename from test/references/richardsanalyticalcc-reference.vtu
rename to test/references/test_richards_analytical_tpfa-reference.vtu
diff --git a/test/references/richardslensbox-reference.vtu b/test/references/test_richards_lens_box-reference.vtu
similarity index 100%
rename from test/references/richardslensbox-reference.vtu
rename to test/references/test_richards_lens_box-reference.vtu
diff --git a/test/references/richardslensbox-reference-parallel.vtu b/test/references/test_richards_lens_box_parallel-reference.vtu
similarity index 100%
rename from test/references/richardslensbox-reference-parallel.vtu
rename to test/references/test_richards_lens_box_parallel-reference.vtu
diff --git a/test/references/richardslenscc-reference.vtu b/test/references/test_richards_lens_tpfa-reference.vtu
similarity index 100%
rename from test/references/richardslenscc-reference.vtu
rename to test/references/test_richards_lens_tpfa-reference.vtu
diff --git a/test/references/richardslenscc-reference-parallel.vtu b/test/references/test_richards_lens_tpfa_parallel-reference.vtu
similarity index 100%
rename from test/references/richardslenscc-reference-parallel.vtu
rename to test/references/test_richards_lens_tpfa_parallel-reference.vtu
diff --git a/test/references/richardsniconductionbox-reference.vtu b/test/references/test_richardsni_conduction_box-reference.vtu
similarity index 100%
rename from test/references/richardsniconductionbox-reference.vtu
rename to test/references/test_richardsni_conduction_box-reference.vtu
diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/test_richardsni_conduction_tpfa-reference.vtu
similarity index 100%
rename from test/references/richardsniconductioncc-reference.vtu
rename to test/references/test_richardsni_conduction_tpfa-reference.vtu
diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/test_richardsni_convection_box-reference.vtu
similarity index 100%
rename from test/references/richardsniconvectionbox-reference.vtu
rename to test/references/test_richardsni_convection_box-reference.vtu
diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/test_richardsni_convection_tpfa-reference.vtu
similarity index 100%
rename from test/references/richardsniconvectioncc-reference.vtu
rename to test/references/test_richardsni_convection_tpfa-reference.vtu
diff --git a/test/references/test_boxrichardsevaporation-reference.vtu b/test/references/test_richardsni_evaporation_box-reference.vtu
similarity index 100%
rename from test/references/test_boxrichardsevaporation-reference.vtu
rename to test/references/test_richardsni_evaporation_box-reference.vtu
diff --git a/test/references/test_ccrichardsevaporation-reference.vtu b/test/references/test_richardsni_evaporation_tpfa-reference.vtu
similarity index 100%
rename from test/references/test_ccrichardsevaporation-reference.vtu
rename to test/references/test_richardsni_evaporation_tpfa-reference.vtu