diff --git a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
index 8ef470faa14f302004ef9714d5f408c77e38d162..94953d3aa0eb4215509d37f7524b3a1fc851bf12 100644
--- a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
@@ -1,45 +1,44 @@
 #add links to input files
 add_input_file_links()
 
-add_executable(test_2p1cni_tpfa EXCLUDE_FROM_ALL test_2p1c_fv.cc)
-target_compile_definitions(test_2p1cni_tpfa PUBLIC "TYPETAG=TwoPOneCNICCTpfa")
+add_executable(test_2p1cni_steaminjection_tpfa EXCLUDE_FROM_ALL main.cc)
+target_compile_definitions(test_2p1cni_steaminjection_tpfa PUBLIC "TYPETAG=TwoPOneCNICCTpfa")
 
-add_executable(test_2p1cni_box EXCLUDE_FROM_ALL test_2p1c_fv.cc)
-target_compile_definitions(test_2p1cni_box PUBLIC "TYPETAG=TwoPOneCNIBox")
+add_executable(test_2p1cni_steaminjection_box EXCLUDE_FROM_ALL main.cc)
+target_compile_definitions(test_2p1cni_steaminjection_box PUBLIC "TYPETAG=TwoPOneCNIBox")
 
-
-dune_add_test(NAME test_2p1cni_box_waterwet
-              TARGET test_2p1cni_box
+dune_add_test(NAME test_2p1cni_steaminjection_waterwet_box
+              TARGET test_2p1cni_steaminjection_box
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/steaminjectionbox-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_boxsteaminjection-00007.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_box test_boxsteaminjection.input")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_waterwet_box-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_box-00007.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input -Problem.Name test_2p1cni_steaminjection_waterwet_box")
 
-dune_add_test(NAME test_2p1cni_tpfa_waterwet
-              TARGET test_2p1cni_tpfa
+dune_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa
+              TARGET test_2p1cni_steaminjection_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/steaminjectioncc-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_ccsteaminjection-00009.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_tpfa test_ccsteaminjection.input")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_waterwet_tpfa-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_tpfa-00009.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input -Problem.Name test_2p1cni_steaminjection_waterwet_tpfa")
 
-dune_add_test(NAME test_2p1cni_box_gaswet
-              TARGET test_2p1cni_box
+dune_add_test(NAME test_2p1cni_steaminjection_gaswet_box
+              TARGET test_2p1cni_steaminjection_box
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/steaminjectionbox_gaswet-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_steaminjectionbox_gaswet-00005.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_box test_boxsteaminjection.input
-                                                                               -Problem.Name test_steaminjectionbox_gaswet
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_gaswet_box-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_gaswet_box-00005.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input
+                                                                               -Problem.Name test_2p1cni_steaminjection_gaswet_box
                                                                                -SpatialParams.GasWetting true")
 
-dune_add_test(NAME test_2p1cni_tpfa_gaswet
-              TARGET test_2p1cni_tpfa
+dune_add_test(NAME test_2p1cni_steaminjection_gaswet_tpfa
+              TARGET test_2p1cni_steaminjection_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/steaminjectioncc_gaswet-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_steaminjectioncc_gaswet-00005.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_tpfa test_ccsteaminjection.input
-                                                                                -Problem.Name test_steaminjectioncc_gaswet
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_gaswet_tpfa-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_gaswet_tpfa-00005.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input
+                                                                                -Problem.Name test_2p1cni_steaminjection_gaswet_tpfa
                                                                                 -SpatialParams.GasWetting true")
diff --git a/test/porousmediumflow/2p1c/implicit/test_2p1c_fv.cc b/test/porousmediumflow/2p1c/implicit/main.cc
similarity index 99%
rename from test/porousmediumflow/2p1c/implicit/test_2p1c_fv.cc
rename to test/porousmediumflow/2p1c/implicit/main.cc
index e597d12c3a4be32d256fa4dd6c5f93fe6e97d8c8..985aeeeb1b0b8d6f83876b79bdbcc5c951605f3b 100644
--- a/test/porousmediumflow/2p1c/implicit/test_2p1c_fv.cc
+++ b/test/porousmediumflow/2p1c/implicit/main.cc
@@ -23,7 +23,7 @@
 */
 #include <config.h>
 
-#include "steaminjectionproblem.hh"
+#include "problem.hh"
 
 #include <ctime>
 #include <iostream>
diff --git a/test/porousmediumflow/2p1c/implicit/test_boxsteaminjection.input b/test/porousmediumflow/2p1c/implicit/params_box.input
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/test_boxsteaminjection.input
rename to test/porousmediumflow/2p1c/implicit/params_box.input
diff --git a/test/porousmediumflow/2p1c/implicit/test_ccsteaminjection.input b/test/porousmediumflow/2p1c/implicit/params_tpfa.input
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/test_ccsteaminjection.input
rename to test/porousmediumflow/2p1c/implicit/params_tpfa.input
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh b/test/porousmediumflow/2p1c/implicit/problem.hh
similarity index 99%
rename from test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
rename to test/porousmediumflow/2p1c/implicit/problem.hh
index 15afd78e6b5f21a3bb1781375a0f70b777c44024..b02d60868e1de9355bc923107b54bbd454d9e809 100644
--- a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
+++ b/test/porousmediumflow/2p1c/implicit/problem.hh
@@ -37,7 +37,7 @@
 #include <dumux/material/components/tabulatedcomponent.hh>
 #include <dumux/material/components/h2o.hh>
 
-#include "steaminjectionspatialparams.hh"
+#include "spatialparams.hh"
 
 namespace Dumux {
 template <class TypeTag>
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh b/test/porousmediumflow/2p1c/implicit/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
rename to test/porousmediumflow/2p1c/implicit/spatialparams.hh
diff --git a/test/references/steaminjectionbox_gaswet-reference.vtu b/test/references/test_2p1cni_steaminjection_gaswet_box-reference.vtu
similarity index 100%
rename from test/references/steaminjectionbox_gaswet-reference.vtu
rename to test/references/test_2p1cni_steaminjection_gaswet_box-reference.vtu
diff --git a/test/references/steaminjectioncc_gaswet-reference.vtu b/test/references/test_2p1cni_steaminjection_gaswet_tpfa-reference.vtu
similarity index 100%
rename from test/references/steaminjectioncc_gaswet-reference.vtu
rename to test/references/test_2p1cni_steaminjection_gaswet_tpfa-reference.vtu
diff --git a/test/references/steaminjectionbox-reference.vtu b/test/references/test_2p1cni_steaminjection_waterwet_box-reference.vtu
similarity index 100%
rename from test/references/steaminjectionbox-reference.vtu
rename to test/references/test_2p1cni_steaminjection_waterwet_box-reference.vtu
diff --git a/test/references/steaminjectioncc-reference.vtu b/test/references/test_2p1cni_steaminjection_waterwet_tpfa-reference.vtu
similarity index 100%
rename from test/references/steaminjectioncc-reference.vtu
rename to test/references/test_2p1cni_steaminjection_waterwet_tpfa-reference.vtu