diff --git a/ProcessLib/RichardsComponentTransport/Tests.cmake b/ProcessLib/RichardsComponentTransport/Tests.cmake
index 266e3382e72f90746fa15b2255d807bb4a21d8b4..294d4eeba10d735eb57549f8a522815d4a0616cb 100644
--- a/ProcessLib/RichardsComponentTransport/Tests.cmake
+++ b/ProcessLib/RichardsComponentTransport/Tests.cmake
@@ -1,290 +1,26 @@
 AddTest(
     NAME RichardsComponentTransport_1D_Padilla_NaCl1
-    PATH Parabolic/RichardsComponentTransport/Padilla
+    PATH Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1
     EXECUTABLE ogs
     EXECUTABLE_ARGS Padilla_NaCl1.prj
     WRAPPER time
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl1_pcs_0_ts_0_t_0.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu Padilla_NaCl1_pcs_0_ts_10005_t_20000.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu Padilla_NaCl1_pcs_0_ts_1050_t_2090.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu Padilla_NaCl1_pcs_0_ts_2050_t_4090.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu Padilla_NaCl1_pcs_0_ts_2100_t_4190.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu Padilla_NaCl1_pcs_0_ts_2150_t_4290.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu Padilla_NaCl1_pcs_0_ts_2200_t_4390.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu Padilla_NaCl1_pcs_0_ts_2250_t_4490.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu Padilla_NaCl1_pcs_0_ts_2300_t_4590.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu Padilla_NaCl1_pcs_0_ts_2350_t_4690.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu Padilla_NaCl1_pcs_0_ts_2400_t_4790.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu Padilla_NaCl1_pcs_0_ts_2450_t_4890.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu Padilla_NaCl1_pcs_0_ts_2500_t_4990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu Padilla_NaCl1_pcs_0_ts_2550_t_5090.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu Padilla_NaCl1_pcs_0_ts_2600_t_5190.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu Padilla_NaCl1_pcs_0_ts_2650_t_5290.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu Padilla_NaCl1_pcs_0_ts_2700_t_5390.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu Padilla_NaCl1_pcs_0_ts_2750_t_5490.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu Padilla_NaCl1_pcs_0_ts_2800_t_5590.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu Padilla_NaCl1_pcs_0_ts_2850_t_5690.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu Padilla_NaCl1_pcs_0_ts_2900_t_5790.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu Padilla_NaCl1_pcs_0_ts_2950_t_5890.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl1_pcs_0_ts_3000_t_5990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu Padilla_NaCl1_pcs_0_ts_3050_t_6090.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu Padilla_NaCl1_pcs_0_ts_3100_t_6190.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu Padilla_NaCl1_pcs_0_ts_3150_t_6290.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu Padilla_NaCl1_pcs_0_ts_3200_t_6390.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu Padilla_NaCl1_pcs_0_ts_3500_t_6990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl1_pcs_0_ts_4500_t_8990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl1_pcs_0_ts_5500_t_10990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu Padilla_NaCl1_pcs_0_ts_550_t_1090.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl1_pcs_0_ts_6500_t_12990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl1_pcs_0_ts_7500_t_14990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl1_pcs_0_ts_8500_t_16990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl1/Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl1_pcs_0_ts_9500_t_18990.000000.vtu saturation saturation 1e-2 1e-10
+    GLOB Padilla_NaCl1_pcs_0_ts_*.vtu concentration concentration 1e-2 1e-10
+    GLOB Padilla_NaCl1_pcs_0_ts_*.vtu pressure pressure 1e-2 1e-10
 )
 
 AddTest(
     NAME RichardsComponentTransport_1D_Padilla_NaCl6
-    PATH Parabolic/RichardsComponentTransport/Padilla
+    PATH Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6
     EXECUTABLE ogs
     EXECUTABLE_ARGS Padilla_NaCl6.prj
     WRAPPER time
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu concentration concentration 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu darcy_velocity darcy_velocity 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu pressure pressure 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu Padilla_NaCl6_pcs_0_ts_0_t_0.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu Padilla_NaCl6_pcs_0_ts_10000_t_19990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu Padilla_NaCl6_pcs_0_ts_1000_t_1990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu Padilla_NaCl6_pcs_0_ts_10500_t_20990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu Padilla_NaCl6_pcs_0_ts_11000_t_21990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu Padilla_NaCl6_pcs_0_ts_11500_t_22990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu Padilla_NaCl6_pcs_0_ts_12000_t_23990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu Padilla_NaCl6_pcs_0_ts_12500_t_24990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu Padilla_NaCl6_pcs_0_ts_13000_t_25990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu Padilla_NaCl6_pcs_0_ts_13500_t_26990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu Padilla_NaCl6_pcs_0_ts_14000_t_27990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu Padilla_NaCl6_pcs_0_ts_15000_t_29990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu Padilla_NaCl6_pcs_0_ts_16000_t_31990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu Padilla_NaCl6_pcs_0_ts_17000_t_33990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu Padilla_NaCl6_pcs_0_ts_18000_t_35990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu Padilla_NaCl6_pcs_0_ts_19000_t_37990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu Padilla_NaCl6_pcs_0_ts_20000_t_39990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu Padilla_NaCl6_pcs_0_ts_20005_t_40000.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu Padilla_NaCl6_pcs_0_ts_2000_t_3990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu Padilla_NaCl6_pcs_0_ts_3000_t_5990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu Padilla_NaCl6_pcs_0_ts_4000_t_7990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu Padilla_NaCl6_pcs_0_ts_4500_t_8990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu Padilla_NaCl6_pcs_0_ts_5000_t_9990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu Padilla_NaCl6_pcs_0_ts_5500_t_10990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu Padilla_NaCl6_pcs_0_ts_6000_t_11990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu Padilla_NaCl6_pcs_0_ts_6500_t_12990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu Padilla_NaCl6_pcs_0_ts_7000_t_13990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu Padilla_NaCl6_pcs_0_ts_7500_t_14990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu Padilla_NaCl6_pcs_0_ts_8000_t_15990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu Padilla_NaCl6_pcs_0_ts_8500_t_16990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu Padilla_NaCl6_pcs_0_ts_9000_t_17990.000000.vtu saturation saturation 1e-2 1e-10
-    Padilla_NaCl6/Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu Padilla_NaCl6_pcs_0_ts_9500_t_18990.000000.vtu saturation saturation 1e-2 1e-10
+    GLOB Padilla_NaCl6_pcs_0_ts_*.vtu concentration concentration 1e-2 1e-10
+    GLOB Padilla_NaCl6_pcs_0_ts_*.vtu pressure pressure 1e-2 1e-10
 )
 
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla.gml b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla.gml
similarity index 100%
rename from Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla.gml
rename to Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla.gml
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1.prj b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj
similarity index 100%
rename from Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1.prj
rename to Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1.vtu b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.vtu
similarity index 100%
rename from Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1.vtu
rename to Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.vtu
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla.gml b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla.gml
new file mode 120000
index 0000000000000000000000000000000000000000..45e7affecce722ea1ea616c9b41aade39ec3c001
--- /dev/null
+++ b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla.gml
@@ -0,0 +1 @@
+../Padilla_NaCl1/Padilla.gml
\ No newline at end of file
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6.prj b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.prj
similarity index 100%
rename from Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6.prj
rename to Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.prj
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6.vtu b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.vtu
similarity index 100%
rename from Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6.vtu
rename to Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.vtu
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 2040e16212c552852ce6f080ac96a69b116d2b22..27ffd9416ed9c9575b5c51f2d3f52795c69020da 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -22,13 +22,19 @@
 #
 #   diff-tester
 #     - DIFF_DATA <list of files to diff>
-#       # the given file is compared to a file with the same name from Tests/Data
+#         the given file is compared to a file with the same name from Tests/Data
 #
 #   vtkdiff-tester
-#     - DIFF_DATA <vtk file a> <vtk file b> <data array a name> <data array b name> <absolute tolerance> <relative tolerance>
-#       # the given data arrays in the vtk files are compared using the given
-#       absolute and relative tolerances.
-#
+#     - DIFF_DATA
+#         <vtk file a> <vtk file b> <data array a name> <data array b name> <absolute tolerance> <relative tolerance>
+#         Can be given multiple times; the given data arrays in the vtk files are
+#         compared using the given absolute and relative tolerances.
+#       OR
+#     - DIFF_DATA
+#         GLOB <globbing expression, e.g. xyz*.vtu> <data array a name> <data array b name> <absolute tolerance> <relative tolerance>
+#         Searches for all matching files in the working directory (PATH).
+#         Matched files are then compared against files with the same name in
+#         the benchmark output directory.
 
 function (AddTest)
     if(NOT OGS_BUILD_TESTS)
@@ -185,12 +191,17 @@ Use six arguments version of AddTest with absolute and relative tolerances")
                 math(EXPR DiffDataAuxIndex "${DiffDataIndex}+5")
                 list(GET AddTest_DIFF_DATA "${DiffDataAuxIndex}" REL_TOL)
 
-                list(APPEND TESTER_COMMAND "${SELECTED_DIFF_TOOL_PATH} \
-                ${AddTest_SOURCE_PATH}/${REFERENCE_VTK_FILE} \
-                ${AddTest_BINARY_PATH}/${VTK_FILE} \
-                -a ${NAME_A} -b ${NAME_B} \
-                --abs ${ABS_TOL} --rel ${REL_TOL} \
-                ${TESTER_ARGS}")
+                if("${REFERENCE_VTK_FILE}" STREQUAL "GLOB")
+                    list(APPEND TESTER_COMMAND "${VTK_FILE} ${NAME_A} ${NAME_B} ${ABS_TOL} ${REL_TOL}")
+                    set(GLOB_MODE TRUE)
+                else()
+                    list(APPEND TESTER_COMMAND "${SELECTED_DIFF_TOOL_PATH} \
+                    ${AddTest_SOURCE_PATH}/${REFERENCE_VTK_FILE} \
+                    ${AddTest_BINARY_PATH}/${VTK_FILE} \
+                    -a ${NAME_A} -b ${NAME_B} \
+                    --abs ${ABS_TOL} --rel ${REL_TOL} \
+                    ${TESTER_ARGS}")
+                endif()
             endforeach()
         else ()
             message(FATAL_ERROR "For vtkdiff tester the number of diff data arguments must be a multiple of six.")
@@ -223,8 +234,8 @@ Use six arguments version of AddTest with absolute and relative tolerances")
         NAME ${TEST_NAME}
         COMMAND ${CMAKE_COMMAND}
         -DEXECUTABLE=${AddTest_EXECUTABLE_PARSED}
-        "-DEXECUTABLE_ARGS=${AddTest_EXECUTABLE_ARGS}"
-        -Dcase_path=${AddTest_SOURCE_PATH}
+        "-DEXECUTABLE_ARGS=${AddTest_EXECUTABLE_ARGS}" # Quoted because passed as list
+        -Dcase_path=${AddTest_SOURCE_PATH}             # see https://stackoverflow.com/a/33248574/80480
         -DBINARY_PATH=${AddTest_BINARY_PATH}
         -DWRAPPER_COMMAND=${WRAPPER_COMMAND}
         "-DWRAPPER_ARGS=${AddTest_WRAPPER_ARGS}"
@@ -248,12 +259,17 @@ Use six arguments version of AddTest with absolute and relative tolerances")
         NAME ${TESTER_NAME}
         COMMAND ${CMAKE_COMMAND}
         -Dcase_path=${AddTest_SOURCE_PATH}
-        -DTESTER_COMMAND=${TESTER_COMMAND}
+        -DBINARY_PATH=${${AddTest_BINARY_PATH}}
+        -DSELECTED_DIFF_TOOL_PATH=${SELECTED_DIFF_TOOL_PATH}
+        "-DTESTER_COMMAND=${TESTER_COMMAND}"
         -DVTKJS_CONVERTER=${VTKJS_CONVERTER}
         -DBINARY_PATH=${AddTest_BINARY_PATH}
         -DVTKJS_OUTPUT_PATH=${PROJECT_SOURCE_DIR}/web/static/vis/${AddTest_PATH}
         "-DVIS_FILES=${AddTest_VIS}"
+        -DGLOB_MODE=${GLOB_MODE}
         -P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestTester.cmake
+        --debug-output
+        WORKING_DIRECTORY ${AddTest_SOURCE_PATH}
     )
     set_tests_properties(${TESTER_NAME} PROPERTIES DEPENDS ${TEST_NAME})
 
diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake
index 900c302dfc504b2259b09ea1ea05f1f1159fc171..680dd144eea2f0164c1e06f16b7c8752d1a21f95 100644
--- a/scripts/cmake/test/AddTestTester.cmake
+++ b/scripts/cmake/test/AddTestTester.cmake
@@ -8,7 +8,7 @@ if(VIS_FILES AND VTKJS_CONVERTER)
     endforeach()
 endif()
 
-message(STATUS "running command checking test results: cd ${case_path} && ${TESTER_COMMAND}")
+message(STATUS "running tester (glob mode: ${GLOB_MODE}): ${TESTER_COMMAND}")
 
 if(WIN32)
     set(TERMINAL_CMD cmd /C)
@@ -16,7 +16,25 @@ else()
     set(TERMINAL_CMD bash -c)
 endif()
 foreach(CMD ${TESTER_COMMAND})
-    set(COMBINED_COMMAND ${COMBINED_COMMAND} COMMAND ${TERMINAL_CMD} ${CMD})
+    if(GLOB_MODE)
+        separate_arguments(CMD)
+        list(GET CMD 0 GLOB)
+        list(GET CMD 1 NAME_A)
+        list(GET CMD 2 NAME_B)
+        list(GET CMD 3 ABS_TOL)
+        list(GET CMD 4 REL_TOL)
+        file(GLOB FILES RELATIVE ${case_path} ${GLOB})
+        list(LENGTH FILES length)
+        message(STATUS "Glob expression '${GLOB}' (${NAME_A}) found ${length} files.")
+        foreach(FILE ${FILES})
+            set(COMBINED_COMMAND ${COMBINED_COMMAND} COMMAND ${TERMINAL_CMD}
+                "${SELECTED_DIFF_TOOL_PATH} \
+                 ${case_path}/${FILE} ${BINARY_PATH}/${FILE} \
+                 -a ${NAME_A} -b ${NAME_B} --abs ${ABS_TOL} --rel ${REL_TOL}")
+        endforeach()
+    else()
+        set(COMBINED_COMMAND ${COMBINED_COMMAND} COMMAND ${TERMINAL_CMD} ${CMD})
+    endif()
 endforeach()
 
 execute_process(