diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
index ac5322ff0ee32766e83bce9564d180af49c9a2ac..a896528e3dc5e45c90fb96530617e47348911ddd 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
@@ -1,25 +1,26 @@
add_input_file_links()
-dune_add_test(NAME test_mpnc_comparison_box
- SOURCES test_mpnc_comparison_fv.cc
+dune_add_test(NAME test_mpnc_2p2ccomparison_box
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=MPNCComparisonBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/mpnc_2p2c_box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_comparison_box-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_comparison_box test_mpnc_comparison_fv.input -Problem.Name test_mpnc_comparison_box")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_2p2ccomparison_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_2p2ccomparison_box-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_2p2ccomparison_box params.input -Problem.Name test_mpnc_2p2ccomparison_box")
-dune_add_test(NAME test_mpnc_comparison_tpfa
- SOURCES test_mpnc_comparison_fv.cc
+dune_add_test(NAME test_mpnc_2p2ccomparison_tpfa
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=MPNCComparisonCC
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/mpnc_2p2c_tpfa-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_comparison_tpfa-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_comparison_tpfa test_mpnc_comparison_fv.input -Problem.Name test_mpnc_comparison_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_2p2ccomparison_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_2p2ccomparison_tpfa-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_2p2ccomparison_tpfa params.input -Problem.Name test_mpnc_2p2ccomparison_tpfa")
#install sources
install(FILES
-mpnc_comparison_problem.hh
-test_mpnc_comparison_fv.cc
+problem.hh
+spatialparams.hh
+main.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/mpnc/2p2ccomparison)
diff --git a/test/porousmediumflow/mpnc/implicit/test_mpnc_obstacle_fv.cc b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/test_mpnc_obstacle_fv.cc
rename to test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc
index 41f6bfb518800441794c600b2f92a8a968b5f0a5..8f605b3afa3ed4dd652b5fe1893ce41032fb50e0 100644
--- a/test/porousmediumflow/mpnc/implicit/test_mpnc_obstacle_fv.cc
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "obstacleproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/test_mpnc_comparison_fv.input b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/params.input
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/test_mpnc_comparison_fv.input
rename to test/porousmediumflow/mpnc/implicit/2p2ccomparison/params.input
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
rename to test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
index 6e7c521ac6ad33f5b1e84b6fadcc1bcbefba57ef..c3781c478dd1523934c7226e09d1a1a0a7fe4a1c 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
@@ -38,7 +38,7 @@
#include <dumux/material/fluidstates/compositional.hh>
#include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
-#include "mpnc_comparison_spatialparams.hh"
+#include "spatialparams.hh"
namespace Dumux {
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_spatialparams.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_spatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh
diff --git a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
index 7f03284bf58bf69e5dc2907ab165fdbc41475317..cad8693eea87fc037f6f4d82c1d595ac556d4426 100644
--- a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
@@ -1,58 +1,4 @@
add_subdirectory(2p2ccomparison)
-add_input_file_links()
-dune_symlink_to_source_files(FILES grids)
-
-dune_add_test(NAME test_mpnc_box
- SOURCES test_mpnc_obstacle_fv.cc
- COMPILE_DEFINITIONS TYPETAG=ObstacleBox
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/obstaclebox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_boxmpnc-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_box test_mpnc.input -Problem.Name test_boxmpnc")
-
-dune_add_test(NAME test_mpnc_tpfa
- SOURCES test_mpnc_obstacle_fv.cc
- COMPILE_DEFINITIONS TYPETAG=ObstacleCC
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/obstaclecc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_ccmpnc-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_tpfa test_mpnc.input -Problem.Name test_ccmpnc")
-# build target for the full kinetic test problem
-dune_add_test(NAME test_mpnckinetic_box
- SOURCES test_boxmpnckinetic.cc
- COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBox
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/evaporationatmosphere-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_boxmpnckinetic-00011.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnckinetic_box test_boxmpnckinetic.input -Problem.Name test_boxmpnckinetic")
-
-# build target for the energy kinetic test problem, two energy balance equations
-dune_add_test(COMPILE_ONLY # since it currently fails miserably with very different results on different machines
- NAME test_mpncthermalnonequil_box
- SOURCES test_boxmpncthermalnonequil.cc
- COMPILE_DEFINITIONS TYPETAG=CombustionOneComponentBox
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/combustion-reference.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_boxmpncthermalnonequil-00073.vtp
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpncthermalnonequil_box test_boxmpncthermalnonequil.input -Problem.Name test_boxmpncthermalnonequil")
-
-
-
-#install sources
-install(FILES
-combustionproblem1c.hh
-combustionfluidsystem.hh
-combustionspatialparams.hh
-evaporationatmosphereproblem.hh
-evaporationatmospherespatialparams.hh
-obstacleproblem.hh
-obstaclespatialparams.hh
-test_boxmpnc.cc
-test_boxmpnckinetic.cc
-test_boxmpncthermalnonequil.cc
-test_ccmpnc.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/mpnc)
+add_subdirectory(kinetic)
+add_subdirectory(obstacle)
+add_subdirectory(thermalnonequilibrium)
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..51864794379c9b13eea88cb9ac9459e2c6fc69aa
--- /dev/null
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_input_file_links()
+
+# build target for the full kinetic test problem
+dune_add_test(NAME test_mpnc_kinetic_box
+ SOURCES main.cc
+ COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBoxTypeTag
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_kinetic_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_kinetic_box-00011.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_kinetic_box params.input -Problem.Name test_mpnc_kinetic_box")
+
+#install sources
+install(FILES
+problem.hh
+spatialparams.hh
+plotoverline2d.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/mpnc/kinetic)
diff --git a/test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.cc b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.cc
rename to test/porousmediumflow/mpnc/implicit/kinetic/main.cc
index ad32dc8140ccce547a9e32edac8dfdab13dcfd61..f1c837f7185df30d5499ef4d1289362e9b822749 100644
--- a/test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.cc
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc
@@ -22,7 +22,7 @@
* \brief Test for the three-phase box model
*/
#include <config.h>
-#include "evaporationatmosphereproblem.hh"
+#include "problem.hh"
#include <ctime>
#include <iostream>
diff --git a/test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.input b/test/porousmediumflow/mpnc/implicit/kinetic/params.input
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/test_boxmpnckinetic.input
rename to test/porousmediumflow/mpnc/implicit/kinetic/params.input
diff --git a/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh b/test/porousmediumflow/mpnc/implicit/kinetic/plotoverline2d.hh
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
rename to test/porousmediumflow/mpnc/implicit/kinetic/plotoverline2d.hh
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
rename to test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
index 8b48469d54bf2146e56542b442ae66f00d9f896f..e48b0d71f86cc7651ac658da9f8aa3f99bd516f3 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
@@ -53,7 +53,7 @@
#include "plotoverline2d.hh"
#include <dumux/material/components/constant.hh>
-#include "evaporationatmospherespatialparams.hh"
+#include "spatialparams.hh"
// material laws for interfacial area
#include <dumux/material/fluidmatrixinteractions/2pia/efftoabslawia.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba3a883030364d081c942e50782c09798d5005e6
--- /dev/null
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt
@@ -0,0 +1,27 @@
+add_input_file_links()
+dune_symlink_to_source_files(FILES grids)
+
+dune_add_test(NAME test_mpnc_obstacle_box
+ SOURCES main.cc
+ COMPILE_DEFINITIONS TYPETAG=ObstacleBoxTypeTag
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_obstacle_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_obstacle_box-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_obstacle_box params.input -Problem.Name test_mpnc_obstacle_box")
+
+dune_add_test(NAME test_mpnc_obstacle_tpfa
+ SOURCES main.cc
+ COMPILE_DEFINITIONS TYPETAG=ObstacleCCTypeTag
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_obstacle_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_obstacle_tpfa-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_obstacle_tpfa params.input -Problem.Name test_mpnc_obstacle_tpfa")
+
+#install sources
+install(FILES
+problem.hh
+spatialparams.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/mpnc/obstacle)
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/test_mpnc_comparison_fv.cc b/test/porousmediumflow/mpnc/implicit/obstacle/main.cc
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/test_mpnc_comparison_fv.cc
rename to test/porousmediumflow/mpnc/implicit/obstacle/main.cc
index bb6ef40cc29752a5dd7f0e88873d7852efddb46b..8f605b3afa3ed4dd652b5fe1893ce41032fb50e0 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/test_mpnc_comparison_fv.cc
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "mpnc_comparison_problem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/test_mpnc.input b/test/porousmediumflow/mpnc/implicit/obstacle/params.input
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/test_mpnc.input
rename to test/porousmediumflow/mpnc/implicit/obstacle/params.input
diff --git a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
rename to test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
index ed0f356835a342fa693de29d5ccdfd6c2f026c1e..35b14ca4efc360aa18d7f1acc3391ced6e74490d 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
@@ -39,7 +39,7 @@
#include <dumux/material/fluidstates/compositional.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
-#include "obstaclespatialparams.hh"
+#include "spatialparams.hh"
namespace Dumux {
diff --git a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9fff88d75d67722b2e117654a72b1e0b52b12b33
--- /dev/null
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_input_file_links()
+dune_symlink_to_source_files(FILES grids)
+
+# build target for the energy kinetic test problem, two energy balance equations
+dune_add_test(COMPILE_ONLY # since it currently fails miserably with very different results on different machines
+ NAME test_mpnc_thermalnonequil_box
+ SOURCES main.cc
+ COMPILE_DEFINITIONS TYPETAG=CombustionOneComponentBox
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_thermalnonequil_box-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_thermalnonequil_box-00073.vtp
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_thermalnonequil_box params.input -Problem.Name test_mpnc_thermalnonequil_box")
+
+#install sources
+install(FILES
+combustionfluidsystem.hh
+problem.hh
+spatialparams.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/mpnc/thermalnonequilibrium)
diff --git a/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh
diff --git a/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX100LogNx100.dgf b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX100LogNx100.dgf
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX100LogNx100.dgf
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX100LogNx100.dgf
diff --git a/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX200LogNx200.dgf b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX200LogNx200.dgf
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX200LogNx200.dgf
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX200LogNx200.dgf
diff --git a/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX400LogNx400.dgf b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX400LogNx400.dgf
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX400LogNx400.dgf
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX400LogNx400.dgf
diff --git a/test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX40LogNx40.dgf b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX40LogNx40.dgf
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/grids/combustionOutflowGridLinNX40LogNx40.dgf
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX40LogNx40.dgf
diff --git a/test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.cc b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.cc
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc
index 1c81c08a73922720732003bfabbde30a89490a61..bce0796ba7134591113f42fd5f256971379af9b3 100644
--- a/test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.cc
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc
@@ -22,7 +22,7 @@
* \brief Test for the three-phase box model
*/
#include <config.h>
-#include "combustionproblem1c.hh"
+#include "problem.hh"
#include <ctime>
#include <iostream>
diff --git a/test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.input b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/params.input
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/test_boxmpncthermalnonequil.input
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/params.input
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
similarity index 99%
rename from test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
index c3ecf97739bb449af3a72ec19f5eaa69a72f3562..1704440493c7830d7b3595440ca2ed6a79c35326 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
@@ -42,7 +42,7 @@
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
-#include "combustionspatialparams.hh"
+#include "spatialparams.hh"
#include "combustionfluidsystem.hh"
namespace Dumux {
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
rename to test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
diff --git a/test/references/mpnc_2p2c_box-reference.vtu b/test/references/test_mpnc_2p2ccomparison_box-reference.vtu
similarity index 100%
rename from test/references/mpnc_2p2c_box-reference.vtu
rename to test/references/test_mpnc_2p2ccomparison_box-reference.vtu
diff --git a/test/references/mpnc_2p2c_tpfa-reference.vtu b/test/references/test_mpnc_2p2ccomparison_tpfa-reference.vtu
similarity index 100%
rename from test/references/mpnc_2p2c_tpfa-reference.vtu
rename to test/references/test_mpnc_2p2ccomparison_tpfa-reference.vtu
diff --git a/test/references/evaporationatmosphere-reference.vtu b/test/references/test_mpnc_kinetic_box-reference.vtu
similarity index 100%
rename from test/references/evaporationatmosphere-reference.vtu
rename to test/references/test_mpnc_kinetic_box-reference.vtu
diff --git a/test/references/obstaclebox-reference.vtu b/test/references/test_mpnc_obstacle_box-reference.vtu
similarity index 100%
rename from test/references/obstaclebox-reference.vtu
rename to test/references/test_mpnc_obstacle_box-reference.vtu
diff --git a/test/references/obstaclecc-reference.vtu b/test/references/test_mpnc_obstacle_tpfa-reference.vtu
similarity index 100%
rename from test/references/obstaclecc-reference.vtu
rename to test/references/test_mpnc_obstacle_tpfa-reference.vtu
diff --git a/test/references/combustion-reference.vtp b/test/references/test_mpnc_thermalnonequil_box-reference.vtp
similarity index 100%
rename from test/references/combustion-reference.vtp
rename to test/references/test_mpnc_thermalnonequil_box-reference.vtp