diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
index 51864794379c9b13eea88cb9ac9459e2c6fc69aa..ef8c5c7d10a386e49a2d8405b385951126db9e6f 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
@@ -3,7 +3,7 @@ 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
+ COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_kinetic_box-reference.vtu
diff --git a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
index de686fc4cf70bc8c1b2bf8d78a78873ca5a26a82..b95d6be06a8333efaa8a27bd6539b0ab3c66dce7 100644
--- a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
@@ -1,22 +1,22 @@
-dune_symlink_to_source_files(FILES "tracer.input")
+dune_symlink_to_source_files(FILES "params.input")
-dune_add_test(NAME test_tracer_sequential
- SOURCES test_cctracer.cc
+dune_add_test(NAME test_1ptracer
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-sequential-transport-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer-00010.vtu
- ${CMAKE_SOURCE_DIR}/test/references/tracer-sequential-pressure-reference.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_transport-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_1ptracer-00010.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_pressure-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1p.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_sequential tracer.input")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1ptracer params.input -Problem.Name test_1ptracer")
#install sources
install(FILES
-1ptestproblem.hh
-1ptestspatialparams.hh
-tracertestproblem.hh
-tracertestspatialparams.hh
-test_cctracer.cc
-tracer.input
+problem_1p.hh
+spatialparams_1p.hh
+problem_tracer.hh
+spatialparams_tracer.hh
+main.cc
+params.input
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/1ptracer)
diff --git a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc b/test/porousmediumflow/tracer/1ptracer/main.cc
similarity index 99%
rename from test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
rename to test/porousmediumflow/tracer/1ptracer/main.cc
index 1af9c7ad18a5d83ab666a80403a7f38ce1a7892b..86a587b6a01a0fce300893f37a0f73f05e83b12d 100644
--- a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
+++ b/test/porousmediumflow/tracer/1ptracer/main.cc
@@ -23,8 +23,8 @@
*/
#include <config.h>
-#include "1ptestproblem.hh"
-#include "tracertestproblem.hh"
+#include "problem_1p.hh"
+#include "problem_tracer.hh"
#include <ctime>
#include <iostream>
diff --git a/test/porousmediumflow/tracer/1ptracer/tracer.input b/test/porousmediumflow/tracer/1ptracer/params.input
similarity index 100%
rename from test/porousmediumflow/tracer/1ptracer/tracer.input
rename to test/porousmediumflow/tracer/1ptracer/params.input
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
similarity index 99%
rename from test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
rename to test/porousmediumflow/tracer/1ptracer/problem_1p.hh
index cb05dcc02b95bb07c437d22c99a4f5c3a0a480be..7de7fa2ae6677805c8af737089d037fba31d17df 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
@@ -33,7 +33,7 @@
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/porousmediumflow/1p/incompressiblelocalresidual.hh>
-#include "1ptestspatialparams.hh"
+#include "spatialparams_1p.hh"
namespace Dumux {
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
similarity index 99%
rename from test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
rename to test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
index cf1c8db726b824f078a7abe769f2dd6171e5f317..a292cb22925187718ee298de8cdb9dce80334ab3 100644
--- a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
@@ -32,7 +32,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/base.hh>
-#include "tracertestspatialparams.hh"
+#include "spatialparams_tracer.hh"
namespace Dumux {
/**
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh
similarity index 100%
rename from test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
rename to test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh
similarity index 100%
rename from test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
rename to test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh
diff --git a/test/porousmediumflow/tracer/constvel/CMakeLists.txt b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
index 144fddfe0177f2854e91629fd98c9c513b9a3fe0..e3f6934094cd9890a191dad48e21f51f36085100 100644
--- a/test/porousmediumflow/tracer/constvel/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
@@ -1,72 +1,72 @@
-dune_symlink_to_source_files(FILES "test_tracer.input")
+dune_symlink_to_source_files(FILES "params.input")
# explicit tracer tests (mass fractions)
dune_add_test(NAME test_tracer_explicit_tpfa
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-cc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_tpfa-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa test_tracer.input -Problem.Name tracer_explicit_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa params.input -Problem.Name test_tracer_explicit_tpfa")
dune_add_test(NAME test_tracer_explicit_box
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_box-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box test_tracer.input -Problem.Name tracer_explicit_box")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box params.input -Problem.Name test_tracer_explicit_box")
# explicit tracer tests (mole fractions, should yield same result)
dune_add_test(NAME test_tracer_explicit_tpfa_mol
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=true
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-cc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_tpfa_mol-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa test_tracer.input -Problem.Name tracer_explicit_tpfa_mol")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa_mol-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa_mol params.input -Problem.Name test_tracer_explicit_tpfa_mol")
dune_add_test(NAME test_tracer_explicit_box_mol
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=true
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_box_mol-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box test_tracer.input -Problem.Name tracer_explicit_box_mol")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box_mol-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box_mol params.input -Problem.Name test_tracer_explicit_box_mol")
# implicit tracer tests
dune_add_test(NAME test_tracer_implicit_tpfa
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=true USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-implicit-cc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_implicit_tpfa-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa test_tracer.input -Problem.Name tracer_implicit_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_implicit_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa params.input -Problem.Name test_tracer_implicit_tpfa")
dune_add_test(NAME test_tracer_implicit_box
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=true USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-implicit-box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_implicit_box-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_box test_tracer.input -Problem.Name tracer_implicit_box")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_implicit_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_box-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_box params.input -Problem.Name test_tracer_implicit_box")
#install sources
install(FILES
-tracertestproblem.hh
-tracertestspatialparams.hh
-test_tracer.cc
-test_tracer.input
+problem.hh
+spatialparams.hh
+main.cc
+params.input
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/constvel)
diff --git a/test/porousmediumflow/tracer/constvel/test_tracer.cc b/test/porousmediumflow/tracer/constvel/main.cc
similarity index 99%
rename from test/porousmediumflow/tracer/constvel/test_tracer.cc
rename to test/porousmediumflow/tracer/constvel/main.cc
index ab2b378871cc15ee1603efd3cb8edf18d7be5bf3..3f84df8b21355633968e6eadb168232ccadc6888 100644
--- a/test/porousmediumflow/tracer/constvel/test_tracer.cc
+++ b/test/porousmediumflow/tracer/constvel/main.cc
@@ -42,7 +42,7 @@
#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/grid/gridmanager.hh>
-#include "tracertestproblem.hh"
+#include "problem.hh"
int main(int argc, char** argv) try
{
diff --git a/test/porousmediumflow/tracer/constvel/test_tracer.input b/test/porousmediumflow/tracer/constvel/params.input
similarity index 100%
rename from test/porousmediumflow/tracer/constvel/test_tracer.input
rename to test/porousmediumflow/tracer/constvel/params.input
diff --git a/test/porousmediumflow/tracer/constvel/tracertestproblem.hh b/test/porousmediumflow/tracer/constvel/problem.hh
similarity index 99%
rename from test/porousmediumflow/tracer/constvel/tracertestproblem.hh
rename to test/porousmediumflow/tracer/constvel/problem.hh
index 8ae67572eec75d2071d7aef3776ca87e80c99570..b2b221e0c56875bdf7f1eb5f25b6b67f32def2e0 100644
--- a/test/porousmediumflow/tracer/constvel/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/constvel/problem.hh
@@ -34,7 +34,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/base.hh>
-#include "tracertestspatialparams.hh"
+#include "spatialparams.hh"
#ifndef USEMOLES // default to true if not set through CMake
#define USEMOLES true
diff --git a/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh b/test/porousmediumflow/tracer/constvel/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
rename to test/porousmediumflow/tracer/constvel/spatialparams.hh
diff --git a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
index d9199c6339ac09071af4a7883ecafd7583cedbf7..fa36c75e982ae742627ff7d5bb631e09eafa13d4 100644
--- a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
@@ -1,25 +1,27 @@
add_input_file_links()
# tracer tests
-dune_add_test(NAME test_maxwellstefan_tpfa
- SOURCES test_tracer_maxwellstefan.cc
+dune_add_test(NAME test_tracer_maxwellstefan_tpfa
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestCC
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/cctracermaxwellstefan-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_ccmaxwellstefan-00026.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_maxwellstefan_tpfa test_tracer_maxwellstefan.input -Problem.Name test_ccmaxwellstefan")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_maxwellstefan_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_tpfa-00026.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_tpfa params.input -Problem.Name test_tracer_maxwellstefan_tpfa")
-dune_add_test(NAME test_maxwellstefan_box
- SOURCES test_tracer_maxwellstefan.cc
+dune_add_test(NAME test_tracer_maxwellstefan_box
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/boxtracermaxwellstefan-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_boxmaxwellstefan-00026.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_maxwellstefan_box test_tracer_maxwellstefan.input -Problem.Name test_boxmaxwellstefan")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_maxwellstefan_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_box-00026.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_box params.input -Problem.Name test_tracer_maxwellstefan_box")
#install sources
install(FILES
-maxwellstefantestproblem.hh
-maxwellstefantestspatialparams.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer)
+problem.hh
+spatialparams.hh
+main.cc
+params.input
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/multicomp)
diff --git a/test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.cc b/test/porousmediumflow/tracer/multicomp/main.cc
similarity index 99%
rename from test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.cc
rename to test/porousmediumflow/tracer/multicomp/main.cc
index 5e1374769c741906e21e2e4e7a7a1e8596fd1811..39668c428081a36f9c8d85e9f8ddcbf501e98969 100644
--- a/test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.cc
+++ b/test/porousmediumflow/tracer/multicomp/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "maxwellstefantestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.input b/test/porousmediumflow/tracer/multicomp/params.input
similarity index 100%
rename from test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.input
rename to test/porousmediumflow/tracer/multicomp/params.input
diff --git a/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh b/test/porousmediumflow/tracer/multicomp/problem.hh
similarity index 99%
rename from test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
rename to test/porousmediumflow/tracer/multicomp/problem.hh
index 2485c89eb81f3b28ef85f5e607a0f4b709a46068..2cba9f75abfdb16d416f4d7e100b458eee4e969a 100644
--- a/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
+++ b/test/porousmediumflow/tracer/multicomp/problem.hh
@@ -34,7 +34,7 @@
#include <dumux/porousmediumflow/tracer/model.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include "maxwellstefantestspatialparams.hh"
+#include "spatialparams.hh"
#include <dumux/discretization/maxwellstefanslaw.hh>
#include <dumux/io/gnuplotinterface.hh>
diff --git a/test/porousmediumflow/tracer/multicomp/maxwellstefantestspatialparams.hh b/test/porousmediumflow/tracer/multicomp/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/tracer/multicomp/maxwellstefantestspatialparams.hh
rename to test/porousmediumflow/tracer/multicomp/spatialparams.hh
diff --git a/test/references/tracer-sequential-pressure-reference.vtu b/test/references/test_1ptracer_pressure-reference.vtu
similarity index 100%
rename from test/references/tracer-sequential-pressure-reference.vtu
rename to test/references/test_1ptracer_pressure-reference.vtu
diff --git a/test/references/tracer-sequential-transport-reference.vtu b/test/references/test_1ptracer_transport-reference.vtu
similarity index 100%
rename from test/references/tracer-sequential-transport-reference.vtu
rename to test/references/test_1ptracer_transport-reference.vtu
diff --git a/test/references/tracer-constvel-explicit-box-reference.vtu b/test/references/test_tracer_explicit_box-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-explicit-box-reference.vtu
rename to test/references/test_tracer_explicit_box-reference.vtu
diff --git a/test/references/tracer-constvel-explicit-cc-reference.vtu b/test/references/test_tracer_explicit_tpfa-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-explicit-cc-reference.vtu
rename to test/references/test_tracer_explicit_tpfa-reference.vtu
diff --git a/test/references/tracer-constvel-implicit-box-reference.vtu b/test/references/test_tracer_implicit_box-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-implicit-box-reference.vtu
rename to test/references/test_tracer_implicit_box-reference.vtu
diff --git a/test/references/tracer-constvel-implicit-cc-reference.vtu b/test/references/test_tracer_implicit_tpfa-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-implicit-cc-reference.vtu
rename to test/references/test_tracer_implicit_tpfa-reference.vtu
diff --git a/test/references/boxtracermaxwellstefan-reference.vtu b/test/references/test_tracer_maxwellstefan_box-reference.vtu
similarity index 100%
rename from test/references/boxtracermaxwellstefan-reference.vtu
rename to test/references/test_tracer_maxwellstefan_box-reference.vtu
diff --git a/test/references/cctracermaxwellstefan-reference.vtu b/test/references/test_tracer_maxwellstefan_tpfa-reference.vtu
similarity index 100%
rename from test/references/cctracermaxwellstefan-reference.vtu
rename to test/references/test_tracer_maxwellstefan_tpfa-reference.vtu