diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index b9a503c6d393ebdf137aa34c728d7e50609722df..d205bafce1d2e111b1fde8cbf5a2ce9c9f8ee69e 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -202,33 +202,30 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_105_t_6.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_165_t_66.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_225_t_126.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_285_t_186.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_345_t_246.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_405_t_306.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_465_t_366.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_525_t_426.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_579_t_480.000000.vtu concentration concentration 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_105_t_6.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_165_t_66.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_225_t_126.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_285_t_186.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_345_t_246.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_405_t_306.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_465_t_366.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_525_t_426.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_579_t_480.000000.vtu pressure pressure 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_105_t_6.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_165_t_66.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_225_t_126.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_285_t_186.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_345_t_246.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_405_t_306.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_465_t_366.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_525_t_426.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-    Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_579_t_480.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000.vtu concentration concentration 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000.vtu pressure pressure 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
 )
 
 AddTest(
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_expected.pvd b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_expected.pvd
deleted file mode 100644
index b52d7f89174f0caeeef12142b76f8b0030a865f8..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_expected.pvd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
-  <Collection>
-    <DataSet timestep="0" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu"/>
-    <DataSet timestep="6" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu"/>
-    <DataSet timestep="66" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu"/>
-    <DataSet timestep="126" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu"/>
-    <DataSet timestep="186" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu"/>
-    <DataSet timestep="246" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu"/>
-    <DataSet timestep="306" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu"/>
-    <DataSet timestep="366" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu"/>
-    <DataSet timestep="426" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu"/>
-    <DataSet timestep="480" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu"/>
-  </Collection>
-</VTKFile>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_expected.pvd b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_expected.pvd
new file mode 100644
index 0000000000000000000000000000000000000000..e89eb503914be16cc72bc2cc1a6d4ef7eebec59d
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_expected.pvd
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
+  <Collection>
+    <DataSet timestep="1185" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu"/>
+    <DataSet timestep="1785" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu"/>
+    <DataSet timestep="2385" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu"/>
+    <DataSet timestep="2985" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu"/>
+    <DataSet timestep="3585" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu"/>
+    <DataSet timestep="4185" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu"/>
+    <DataSet timestep="4785" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu"/>
+    <DataSet timestep="5385" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu"/>
+  </Collection>
+</VTKFile>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu
deleted file mode 100644
index 3172895ccebca01a77878d2703ecec97f55d0ba8..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d66a7ccc66c69787b95e872bb0b72987c20b7241cf939c84c8c5376058d788e
-size 214526
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu
deleted file mode 100644
index c7cc17eb06553aea553c9eb6dc3a5dc6030f6a45..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a9748b2c6d1abe34df58d4efcc38fcd79a9e4d128b265d6a8ea041a16f34899
-size 288696
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_106_t_7.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_106_t_7.000000_expected.vtu
deleted file mode 100644
index d480e7bce5d67042e1de1b55ef8a71a8db7cc913..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_106_t_7.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b27504457046dbcffcc5ca4a6b9f14fd9a629f973bdb987a7c44277b99fc636
-size 288692
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..c40a3989a3b3f35167e16ea50b358b6ec0dd53ee
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2b46accf12d9fb50885d7fa649c39e03150007a8ea74fd708742f7f403008f3
+size 271956
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_135_t_36.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_135_t_36.000000_expected.vtu
deleted file mode 100644
index a72e2d54b6ce9da39cad475877f3b3907922dcd5..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_135_t_36.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ee9c5b5df397d9646dc2717dff0e213ac38f2fd616916cfa7df0564a68a1431
-size 288716
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu
deleted file mode 100644
index 794f4506075ae939922e093d416da33496a50d87..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fca631612913078b0677e13b1fea0c3809178481f6e108ac37c0dc4cbcd7e06f
-size 288639
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..5f29b9130c3deb920ea2b17bdbd5453e2f81ca18
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc542473d35d6da123742a1ad8138718bbd99aef4494b6ee40135db6e9fb99d2
+size 271499
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_195_t_96.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_195_t_96.000000_expected.vtu
deleted file mode 100644
index af8ec87d826cd2300b9a0fba1e1f693f712afaac..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_195_t_96.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af829dafe01ae1d512f85f9048a9801a4d9cd3d8f84543be37512ebf4fcfda01
-size 288548
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu
deleted file mode 100644
index e8fae79c785bc7d559cd9aea3487c7fbf7ec4065..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e8803c6685fabd3285b996c22a2b8f0c99333d2d4e5ee57bfe3de5336fd5867
-size 288522
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..ff6c68c9395f1c21048b49706cd3eea20c4f6891
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59db5ebfeb65e311bb4b95f6527ca2a4637f35ead904d7d6dd1e93d382fcb89c
+size 271247
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_255_t_156.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_255_t_156.000000_expected.vtu
deleted file mode 100644
index 58a15ba1c977bf90031efef43123500a79a4ed02..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_255_t_156.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91b2ea7ead2eddeb675d190a0e176dc4db9006208a86d9f3feaa29ddb0079238
-size 288443
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu
deleted file mode 100644
index 876d3ee9f35efc1dabeb41a1f7d9656ac8a7d72b..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff80798bcea7e35afff0fd5bdbea0eed966987721335887c740ed687a855c1f7
-size 288327
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..e83e7d917df4cb901c7bbbfcbefb887ceeebd910
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:312d1f04d20d2772326ae6b93eb280a68eb29c5e64f0b47c7e0cafeab5462d91
+size 270915
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_315_t_216.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_315_t_216.000000_expected.vtu
deleted file mode 100644
index 525c86e9bae4a595f855b88fa84113e5be4c1132..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_315_t_216.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fec200908d1e2f7cc7f7213ee86dec9d010181acd1cc4be30661d0f359c090d2
-size 288300
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu
deleted file mode 100644
index 45f38e11b07e2e002b9794373808bd78344694f0..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4110d70293a425c22240f7bdd2ee6be09214c5f503eefd1c7ba88a9571aa981
-size 288224
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..164621b39ebe857146467b4f13238adb0f6eebaf
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47f8cae85a5ea7c53d0e3d28fc9623909a34c042550657fe2f9e1879792629e1
+size 270728
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_375_t_276.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_375_t_276.000000_expected.vtu
deleted file mode 100644
index dc6caaf8dd888546ce7d988316c35c6ee6f413d9..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_375_t_276.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6508db7756c7dc4d5a590d07129d0f6c30bcf97d58da906c1c6fa4448f56d31
-size 288148
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu
deleted file mode 100644
index 8d118f119633a2ab38bee4fc1203e862ba0ef667..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:001ccfde65df87c7622ead4160e707ebe19ffcd7cbe52b5dbb4b485c0ce74679
-size 288026
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..539211171f6f9e7eb4767b6df252475a2157e2ad
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50fd56b12c4b79d81b834357c81f15d5ca4242e54f38fd9835cdc2a7109ae471
+size 270627
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_435_t_336.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_435_t_336.000000_expected.vtu
deleted file mode 100644
index f9e85e6e899c1f6c465ee79912976972a750b390..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_435_t_336.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d61cee58150321da305fd67078bc2e36ba92c00f060128627f86cc086bfb2834
-size 287996
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu
deleted file mode 100644
index 02816f9b04eea0e815321c92a65d850385c8c7a5..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ad9abaf5911b17ffb7cafa97bf32b4b6b47ece7daf0df702cf5565ffede7818
-size 287888
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..df964674aa544d4665b20cf268bd1bc9b6a1aa99
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:429829d06b63e99dc7e67e0d05f3be06402c6c297da14b71cb0c3c426dfb3f41
+size 270568
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_495_t_396.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_495_t_396.000000_expected.vtu
deleted file mode 100644
index dd3ba6fb7f163d3ddf54dedaa7198f7722e98d92..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_495_t_396.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6f582df76e83158f7564a4fa464319dc152a540ca7e980106aa1c4bb52caf6c
-size 287715
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu
deleted file mode 100644
index c6daf697034f8aa3ec871acbe72132a1d043da72..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f3bb9a66c1ba97f1a5d6a8c60b3f29e2496e86cbfbe90c692868a320b2c2a5c
-size 287663
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..e8d1145c3dca162951266f0b157858fed3b92576
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:665340f712865e8cc77223866ee0e1d18b837815573b31ba5d412d00601bb652
+size 270543
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_555_t_456.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_555_t_456.000000_expected.vtu
deleted file mode 100644
index f39ccb7221f5e22ae88826e0c5f6e516220880fd..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_555_t_456.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dcffb728013d9251bad8915c48d6c279f9633c0ad60b59f7f5fe6a4e6f4ffbb5
-size 287568
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu
deleted file mode 100644
index 9296f9e98b2b2354a35b220f3765f3fddf8e096b..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f610e623d50bcc7fdeb74919119d4c80a364bb175e34f2a00876c7e2c57ba8db
-size 287488
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
index a0a60b03fca54a0459515d9ed15f89b9969a91cf..25dee98758f15aa5c434b16bb451c6a71f0a06a2 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
@@ -43,8 +43,8 @@
                 </porous_medium>
             </porous_medium>
             <fluid_reference_density>rho_fluid</fluid_reference_density>
-            <solute_dispersivity_longitudinal>alpha_l</solute_dispersivity_longitudinal>
-            <solute_dispersivity_transverse>alpha_t</solute_dispersivity_transverse>
+            <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal>
+            <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse>
             <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient>
             <retardation_factor>retardation</retardation_factor>
             <decay_rate>decay</decay_rate>
@@ -76,18 +76,22 @@
                 <time_stepping>
                     <type>FixedTimeStepping</type>
                     <t_initial>0.0</t_initial>
-                    <t_end>480</t_end>
+                    <t_end>4800</t_end>
                     <timesteps>
                         <pair>
                             <repeat>50</repeat>
                             <delta_t>0.01</delta_t>
                         </pair>
                         <pair>
-                            <repeat>55</repeat>
+                            <repeat>595</repeat>
                             <delta_t>0.1</delta_t>
                         </pair>
                         <pair>
-                            <repeat>4290</repeat>
+                            <repeat>1140</repeat>
+                            <delta_t>1.0</delta_t>
+                        </pair>
+                        <pair>
+                            <repeat>3600</repeat>
                             <delta_t>1.0</delta_t>
                         </pair>
                     </timesteps>
@@ -100,11 +104,15 @@
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
-                    <each_steps>105</each_steps>
+                    <each_steps>1185</each_steps>
+                </pair>
+                <pair>
+                    <repeat>1</repeat>
+                    <each_steps>600</each_steps>
                 </pair>
                 <pair>
-                    <repeat>7</repeat>
-                    <each_steps>60</each_steps>
+                    <repeat>6</repeat>
+                    <each_steps>600</each_steps>
                 </pair>
             </timesteps>
         </output>
@@ -131,14 +139,14 @@
             <value>0</value>
         </parameter>
         <parameter>
-            <name>alpha_l</name>
+            <name>beta_l</name>
             <type>Constant</type>
             <value>5e-3</value>
         </parameter>
         <parameter>
-            <name>alpha_t</name>
+            <name>beta_t</name>
             <type>Constant</type>
-            <value>5e-4</value>
+            <value>0.0005</value>
         </parameter>
         <parameter>
             <name>c_ini</name>
@@ -203,23 +211,23 @@
         <nonlinear_solver>
             <name>basic_picard</name>
             <type>Picard</type>
-            <max_iter>300</max_iter>
+            <max_iter>200</max_iter>
             <linear_solver>general_linear_solver</linear_solver>
         </nonlinear_solver>
-    </nonlinear_solvers>
+        </nonlinear_solvers>
     <linear_solvers>
         <linear_solver>
             <name>general_linear_solver</name>
             <lis>-i bicgstab -p ilut -tol 1e-12 -maxiter 200000</lis>
             <eigen>
                 <solver_type>BiCGSTAB</solver_type>
-                <precon_type>DIAGONAL</solver_precon>
+                <precon_type>DIAGONAL</precon_type>
                 <max_iteration_step>10000</max_iteration_step>
                 <error_tolerance>1e-11</error_tolerance>
             </eigen>
             <petsc>
                 <prefix>hc</prefix>
-                <parameters>-hc_ksp_type bcgs -hc_pc_type bjacobi -hc_ksp_rtol 1e-11 -hc_ksp_max_it 20000</parameters>
+                <parameters>-hc_ksp_type bcgs -hc_pc_type bjacobi -hc_ksp_rtol 1e-10 -hc_ksp_max_it 20000</parameters>
             </petsc>
         </linear_solver>
     </linear_solvers>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu
index bc9c755f0b7dec2e52221b888b49da68f5753e7c..292c71b5e46f76eeb19fc16871c9b023aef7afb8 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37b3a57ed13ecc4b2b281b7fe3c92f6fd4b3d8d5b2c06844c4ee7e4c77f6a35f
-size 124753
+oid sha256:2d867312a3bc2aa57f76855fe90c04589080f74b027329149bc97d051cbe41db
+size 116341
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu
index 73151714e97281534a4c9529263c5a9cf1da99b5..add66660fbae0767026ac4095ee95e6027f53703 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f08e9a558fdacad5d31c86c22ca9caf67a4f7bfa748aab915caf2697460f815
-size 4622
+oid sha256:2b96a7dd50ced0f20f80a0beb38a9c39d8f5903fd5b706ef938b8a837c60d594
+size 4614
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu
index ead81c90c1e831abdbedaa4dfc0c2422a5bfa207..6179cbb42e029f0392be3979f38e5a17ef3c93f0 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3072c38f251de3b5d357972d57a60c43de0817bf3c9fba795872384ac2486e17
-size 3456
+oid sha256:0e52018e35d42997c6cbfd14a5360647f837093336ce95f292a7e29c14d8ca9a
+size 3444
diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png b/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png
index e476cf42b759422e170f79cdd0feae2389c4d3a0..d99cf5532ebac743162a805df35a7aaa9eb8e8a3 100644
--- a/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png
+++ b/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc2961a107655893414dd33314c781801fa619ed76f359bc0ec70f8f959df4a3
-size 134014
+oid sha256:50870a917b3f2177f0a03e1d1765545c8837693e21a382daf17cd25fb3fecee8
+size 127617
diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png b/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png
index 46ce80dfb8798bd5bf8298717b3a04c15ee9b0e7..1a38cfa15cd86ba0c3c4fa02bbf013c6f0cb2436 100644
--- a/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png
+++ b/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:247b99483405126550ae3fb863f58e54613906e8702aa02ae4d9f98adf6eebf7
-size 142713
+oid sha256:7e5b476d8521ab27c6df5f7b7360e232d33c4cebedca7b70d5c46df40642592d
+size 134933
diff --git a/web/content/docs/benchmarks/hydro-component/goswami.pandoc b/web/content/docs/benchmarks/hydro-component/goswami.pandoc
index 3f6848255918dc5900142eb52180026f4bf3b1b2..b59cb2f63cc7210bba38e4eb789452b36dc4764f 100644
--- a/web/content/docs/benchmarks/hydro-component/goswami.pandoc
+++ b/web/content/docs/benchmarks/hydro-component/goswami.pandoc
@@ -36,11 +36,9 @@ A comparison of numerical and laboratory data is shown in the figure below. The
 
 {{< img src="../Goswami_Exp_Num_Comp.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the steady state location of the concentration front (see original research paper).">}}
 
-{{< data-link >}}
 
 {{< img src="../Goswami_Transient_States.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the transient state locations of the concentration front (see original research paper).">}}
 
-{{< data-link >}}
 
 ## Literature