diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index c73fdaa5321bf57ac540da4e5544b2e813b8b17d..45229b6f3dc1fa9cd97be08070dd253cd15b2e7a 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -193,41 +193,41 @@ AddTest(
     VIS DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_672_t_900.000000.vtu
 )
 
-#AddTest(
-#    NAME LARGE_2D_ComponentTransport_Goswami
-#    PATH Parabolic/ComponentTransport/goswami
-#    EXECUTABLE ogs
-#    EXECUTABLE_ARGS goswami_input.prj
-#    WRAPPER time
-#    TESTER vtkdiff
-#    REQUIREMENTS NOT OGS_USE_MPI
-#    DIFF_DATA
-#    ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu concentration concentration 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu pressure pressure 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
-#    VIS ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu
-#)
+AddTest(
+    NAME LARGE_2D_ComponentTransport_Goswami
+    PATH Parabolic/ComponentTransport/goswami
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS goswami_input.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI AND DISABLE_GOSWAMI_UNTIL_CONSTRAINED_NEUMANN_BC
+    DIFF_DATA
+    ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu concentration concentration 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu pressure pressure 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+    VIS ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu
+)
 
 AddTest(
     NAME LARGE_2D_ComponentTransport_Elder
diff --git a/Testing/Temporary/CTestCostData.txt b/Testing/Temporary/CTestCostData.txt
deleted file mode 100644
index ed97d539c095cf1413af30cc23dea272095b97dd..0000000000000000000000000000000000000000
--- a/Testing/Temporary/CTestCostData.txt
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
index 0d7e77d73bd024b8a0953f7e5293451f4ea64e82..eb3a7677364f7b40e1bd36bceaa7a8c2fc391a59 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
@@ -37,7 +37,7 @@
                         <type>Constant</type>
                         <porosity_parameter>constant_porosity_parameter</porosity_parameter>
                     </porosity>
-	            <storage>
+                    <storage>
                         <type>Constant</type>
                         <value>0.0</value>
                     </storage>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder_pcs_0.pvd b/Tests/Data/Parabolic/ComponentTransport/elder/elder_pcs_0.pvd
deleted file mode 100644
index 33e87781b7a0340810c2e6fd5e2add5b3c10972c..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder_pcs_0.pvd
+++ /dev/null
@@ -1,31 +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="elder_pcs_0_ts_0_t_0.000000.vtu"/>
-    <DataSet timestep="5259600" group="" part="0" file="elder_pcs_0_ts_20_t_5259600.000000.vtu"/>
-    <DataSet timestep="10519200" group="" part="0" file="elder_pcs_0_ts_40_t_10519200.000000.vtu"/>
-    <DataSet timestep="15778800" group="" part="0" file="elder_pcs_0_ts_60_t_15778800.000000.vtu"/>
-    <DataSet timestep="21038400" group="" part="0" file="elder_pcs_0_ts_80_t_21038400.000000.vtu"/>
-    <DataSet timestep="26298000" group="" part="0" file="elder_pcs_0_ts_100_t_26298000.000000.vtu"/>
-    <DataSet timestep="31557600" group="" part="0" file="elder_pcs_0_ts_120_t_31557600.000000.vtu"/>
-    <DataSet timestep="36817200" group="" part="0" file="elder_pcs_0_ts_140_t_36817200.000000.vtu"/>
-    <DataSet timestep="42076800" group="" part="0" file="elder_pcs_0_ts_160_t_42076800.000000.vtu"/>
-    <DataSet timestep="47336400" group="" part="0" file="elder_pcs_0_ts_180_t_47336400.000000.vtu"/>
-    <DataSet timestep="52596000" group="" part="0" file="elder_pcs_0_ts_200_t_52596000.000000.vtu"/>
-    <DataSet timestep="57855600" group="" part="0" file="elder_pcs_0_ts_220_t_57855600.000000.vtu"/>
-    <DataSet timestep="63115200" group="" part="0" file="elder_pcs_0_ts_240_t_63115200.000000.vtu"/>
-    <DataSet timestep="68374800" group="" part="0" file="elder_pcs_0_ts_260_t_68374800.000000.vtu"/>
-    <DataSet timestep="73634400" group="" part="0" file="elder_pcs_0_ts_280_t_73634400.000000.vtu"/>
-    <DataSet timestep="78894000" group="" part="0" file="elder_pcs_0_ts_300_t_78894000.000000.vtu"/>
-    <DataSet timestep="84153600" group="" part="0" file="elder_pcs_0_ts_320_t_84153600.000000.vtu"/>
-    <DataSet timestep="89413200" group="" part="0" file="elder_pcs_0_ts_340_t_89413200.000000.vtu"/>
-    <DataSet timestep="94672800" group="" part="0" file="elder_pcs_0_ts_360_t_94672800.000000.vtu"/>
-    <DataSet timestep="99932400" group="" part="0" file="elder_pcs_0_ts_380_t_99932400.000000.vtu"/>
-    <DataSet timestep="105192000" group="" part="0" file="elder_pcs_0_ts_400_t_105192000.000000.vtu"/>
-    <DataSet timestep="110451600" group="" part="0" file="elder_pcs_0_ts_420_t_110451600.000000.vtu"/>
-    <DataSet timestep="115711200" group="" part="0" file="elder_pcs_0_ts_440_t_115711200.000000.vtu"/>
-    <DataSet timestep="120970800" group="" part="0" file="elder_pcs_0_ts_460_t_120970800.000000.vtu"/>
-    <DataSet timestep="126230400" group="" part="0" file="elder_pcs_0_ts_480_t_126230400.000000.vtu"/>
-    <DataSet timestep="131490000" group="" part="0" file="elder_pcs_0_ts_500_t_131490000.000000.vtu"/>
-  </Collection>
-</VTKFile>