diff --git a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg
index 4d61f8a5..7f6a2b84 100644
--- a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg
@@ -14,12 +14,12 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
 # ts is in 5 year increments
 ts_num_years = 5
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test-pr628-20241011v12"
 # We want to produce diagnostics for 10 years.
 years = "1985:1995:10",
 
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg
index eaf479c2..ea3a163a 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [climo]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg
index 1229398c..e96de2d8 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [climo]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg
index e000cd18..a80f0723 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test-pr628-20241011v12"
 years = "1995:1999:4",
 
 [climo]
@@ -42,7 +42,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
   short_ref_name = "v3.LR.historical_0051"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg
index 5dd8ad79..7c7dc8ba 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [ts]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg
index f27e990d..1212fd24 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [ts]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg
index d251bc29..5c339953 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test-pr628-20241011v12"
 years = "1995:1999:4",
 
 [ts]
@@ -44,7 +44,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "enso_diags","qbo",
   short_ref_name = "v3.LR.historical_0051"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg
index 9aaf1fcc..55340dd1 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [climo]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg
index af785a78..5be32f12 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [climo]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg
index ee55d997..612cbeb5 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test-pr628-20241011v12"
 years = "1995:1999:4",
 
 [climo]
@@ -40,7 +40,7 @@ walltime = "5:00:00"
   ref_name = "v3.LR.historical_0051"
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
+  reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
   run_type = "model_vs_model"
   sets = "diurnal_cycle",
   short_ref_name = "v3.LR.historical_0051"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg
index d7f09e86..bfba7957 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [climo]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg
index f2047f31..f62e9d14 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/test-pr628-20241011v12"
 years = "1995:1999:4",
 
 [climo]
@@ -41,7 +41,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "lat_lon_land",
   short_ref_name = "v3.LR.historical_0051"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg
index 4db1ecf8..34ba3148 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [ts]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg
index 0c31edb4..4e193c8e 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [ts]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg
index 6a205ce4..060331ce 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/test-pr628-20241011v12"
 years = "1995:1999:4",
 
 [ts]
@@ -45,7 +45,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   # reference_data_path_ts_rof determined automatically
   run_type = "model_vs_model"
   sets="streamflow"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
index b5a01af6..bafdc8e8 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
@@ -6,15 +6,15 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test-pr628-20241011v12"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/test-pr628-20241011v6/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/test-pr628-20241011v12/v3.LR.historical_0051"
 walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
index af8e33b2..e2cc8349 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
@@ -6,13 +6,13 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test-pr628-20241011v12"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/test-pr628-20241011v6/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/test-pr628-20241011v12/v3.LR.historical_0051"
 walltime = "00:30:00"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg
index 39f2bac8..cb13cab4 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg
@@ -6,15 +6,15 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test-pr628-20241011v12"
 years = "1995:1997:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/test-pr628-20241011v6/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/test-pr628-20241011v12/v3.LR.historical_0051"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -37,7 +37,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1986",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   # reference_data_path_tc determined automatically
   run_type = "model_vs_model"
   sets = "tc_analysis",
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg
index ba464021..bb010d01 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [ts]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg
index 40bd0eea..36e774c6 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/test-pr628-20241011v12"
 years = "1985:1989:4",
 
 [ts]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg
index bab57bb4..153b18bc 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/test-pr628-20241011v12"
 years = "1995:1999:4",
 
 [ts]
@@ -44,7 +44,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   # reference_data_path_daily is determined automatically
   run_type = "model_vs_model"
   sets = "tropical_subseasonal",
diff --git a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg
index 8449181d..851cd937 100644
--- a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/test-pr628-20241011v12"
 
 [ts]
 active = True
diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg
index 5df4ea2d..9f050990 100644
--- a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/test-pr628-20241011v12"
 
 [ts]
 active = True
diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg
index ddd60cd2..08704926 100644
--- a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/test-pr628-20241011v12"
 
 [ts]
 active = True
diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg
index 5814204d..0c223858 100644
--- a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/test-pr628-20241011v12"
 
 [ts]
 active = True
diff --git a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg
index 0e43f73e..12a1119c 100644
--- a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/test-pr628-20241011v12"
 
 [ts]
 active = True
diff --git a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg
index 3a07ab6c..4ee6e2e4 100644
--- a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg
@@ -6,10 +6,10 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/test-pr628-20241011v12"
 
 [mpas_analysis]
 active = True
diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg
index 41b50b41..8f1f1e02 100644
--- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg
@@ -6,13 +6,13 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test-pr628-20241011v12"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/test-pr628-20241011v6/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/test-pr628-20241011v12/v3.LR.historical_0051"
 walltime = "00:30:00"
diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg
index 3e9f36da..77929ff5 100644
--- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg
@@ -8,13 +8,13 @@ environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test-pr628-20241011v12"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/test-pr628-20241011v6/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/test-pr628-20241011v12/v3.LR.historical_0051"
 walltime = "00:30:00"
diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg
index 5b87467f..c561cfb2 100644
--- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg
@@ -30,11 +30,11 @@ input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
 # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "compute"
 qos = "regular"
 walltime = "07:00:00"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/test-pr628-20241011v12"
 
 [bundle]
 
@@ -95,11 +95,12 @@ years = "1985:1989:2",
   mapping_file = ""
   vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
 
-[tc_analysis]
-active = True
-bundle = "bundle3" # Let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_bundles_scratch/test-pr628-20241011v6/v3.LR.historical_0051"
-years = "1985:1989:2",
+# TODO: Add "tc_analysis" back in after empty dat is resolved.
+# [tc_analysis]
+# active = True
+# bundle = "bundle3" # Let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
+# scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_bundles_scratch/test-pr628-20241011v12/v3.LR.historical_0051"
+# years = "1985:1989:2",
 
 [e3sm_diags]
 active = True
@@ -126,9 +127,10 @@ years = "1985:1989:2",
   ref_name = "v3.LR.historical_0051"
   ref_start_yr = 1985
   ref_years = "1985-1986",
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
-  sets = "polar","enso_diags","streamflow","tc_analysis",
+  # TODO: Add "tc_analysis" back in after empty dat is resolved.
+  sets = "polar","enso_diags","streamflow",
   short_ref_name = "v3.LR.historical_0051"
   swap_test_ref = False
   tag = "model_vs_model"
diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
index 6801b87b..4d08936c 100644
--- a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
@@ -7,11 +7,11 @@ fail_on_dependency_skip = True
 input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test-pr628-20241011v6/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test-pr628-20241011v12/v2.LR.historical_0201"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/test-pr628-20241011v6"
-years = "1870:1874:2",
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/test-pr628-20241011v12"
+years = "1980:1984:2",
 
 [climo]
 active = True
@@ -66,7 +66,7 @@ walltime = "00:30:00"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
-  years = "1870:1880:5",
+  years = "1980:1990:5",
 
   [[ lnd_monthly_glb ]]
   frequency = "monthly"
@@ -74,7 +74,7 @@ walltime = "00:30:00"
   input_subdir = "archive/lnd/hist"
   mapping_file = "glb"
   vars = "LAISHA,LAISUN"
-  years = "1870:1880:5",
+  years = "1980:1990:5",
 
   [[ land_monthly ]]
   extra_vars = "landfrac"
@@ -86,7 +86,7 @@ walltime = "00:30:00"
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v2_scratch/test-pr628-20241011v6/v2.LR.historical_0201"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v2_scratch/test-pr628-20241011v12/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -99,9 +99,10 @@ multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-ref_final_yr = 1871
-ref_start_yr = 1870
-ref_years = "1870-1871",
+ref_end_yr = 1981
+ref_final_yr = 1981
+ref_start_yr = 1980
+ref_years = "1980-1981",
 # Include all sets
 # min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
 # min_case_e3sm_diags_depend_on_ts: "enso_diags","qbo",
@@ -113,7 +114,7 @@ sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","merid
 short_name = "v2.LR.historical_0201"
 ts_num_years = 2
 walltime = "5:00:00"
-years = "1872:1874:2",
+years = "1982:1984:2",
 
   [[ atm_monthly_180x360_aave ]]
   climo_subsection = "atm_monthly_180x360_aave"
@@ -126,7 +127,7 @@ years = "1872:1874:2",
   partition = "compute"
   qos = "regular"
   ref_name = "v2.LR.historical_0201"
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test-pr628-20241011v6/v2.LR.historical_0201/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test-pr628-20241011v12/v2.LR.historical_0201/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   short_ref_name = "same simulation"
   swap_test_ref = False
@@ -134,7 +135,7 @@ years = "1872:1874:2",
   ts_daily_subsection = "atm_monthly_180x360_aave"
   ts_num_years_ref = 2
   ts_subsection = "atm_monthly_180x360_aave"
-  years = "1870:1872:2",
+  years = "1980:1982:2",
 
   [[ lnd_monthly_mvm_lnd ]]
   # Test model-vs-model using the same files as the reference
@@ -143,7 +144,7 @@ years = "1872:1874:2",
   partition = "compute"
   qos = "regular"
   ref_name = "v2.LR.historical_0201"
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test-pr628-20241011v6/v2.LR.historical_0201/post/lnd/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test-pr628-20241011v12/v2.LR.historical_0201/post/lnd/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "lat_lon_land",
   short_ref_name = "same simulation"
@@ -153,28 +154,28 @@ years = "1872:1874:2",
 
 [mpas_analysis]
 active = True
-anomalyRefYear = 1870
-climo_years ="1870-1874", "1875-1880",
-enso_years = "1870-1874", "1875-1880",
+anomalyRefYear = 1980
+climo_years ="1980-1984", "1985-1990",
+enso_years = "1980-1984", "1985-1990",
 mesh = "EC30to60E2r2"
 parallelTaskCount = 6
 partition = "compute"
 qos = "regular"
 shortTermArchive = True
-ts_years = "1870-1874", "1870-1880",
+ts_years = "1980-1984", "1980-1990",
 walltime = "00:30:00"
 
 [global_time_series]
 active = True
-climo_years ="1870-1874", "1875-1880",
+climo_years ="1980-1984", "1985-1990",
 experiment_name = "v2.LR.historical_0201"
 figstr = "v2.LR.historical_0201"
-moc_file=mocTimeSeries_1870-1880.nc
+moc_file=mocTimeSeries_1980-1990.nc
 plots_lnd = "LAISHA,LAISUN"
 ts_num_years = 5
-ts_years = "1870-1874", "1870-1880",
+ts_years = "1980-1984", "1980-1990",
 walltime = "00:30:00"
-years = "1870-1880",
+years = "1980-1990",
 
 [ilamb]
 active = True
@@ -183,4 +184,4 @@ partition = "compute"
 short_name = "v2.LR.historical_0201"
 ts_num_years = 2
 walltime = "2:00:00"
-years = "1870:1874:2",
+years = "1980:1984:2",
diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
index 43b96993..86efc271 100644
--- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
@@ -9,10 +9,10 @@ guess_section_parameters = False
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v6/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v12/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test-pr628-20241011v6"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test-pr628-20241011v12"
 years = "1985:1989:2",
 
 [climo]
@@ -88,10 +88,11 @@ walltime = "00:30:00"
   ts_fmt = "cmip"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
-[tc_analysis]
-active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v3_scratch/test-pr628-20241011v6/v3.LR.historical_0051"
-walltime = "00:30:00"
+# TODO: Add "tc_analysis" back in after empty dat is resolved.
+# [tc_analysis]
+# active = True
+# scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v3_scratch/test-pr628-20241011v12/v3.LR.historical_0051"
+# walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
@@ -99,18 +100,12 @@ climo_diurnal_frequency = "diurnal_8xdaily"
 climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
 climo_subsection = "atm_monthly_180x360_aave"
 environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
-gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
-obs_ts = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/"
 partition = "compute"
 qos = "regular"
-reference_data_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/climatology/"
-reference_data_path_climo_diurnal = "/lcrc/group/e3sm/diagnostics/observations/Atm/climatology/post/atm/180x360_aave/clim_diurnal_8xdaily"
-reference_data_path_ts = "/lcrc/group/e3sm/diagnostics/atm/180x360_aave/ts/monthly"
-reference_data_path_ts_daily = "/lcrc/group/e3sm/diagnostics/atm/180x360_aave/ts/daily"
-reference_data_path_ts_rof = "/lcrc/group/e3sm/diagnostics/rof/native/ts/monthly"
+ref_end_yr = 1986
 ref_final_yr = 1986
 ref_start_yr = 1985
 ref_years = "1985-1986",
@@ -124,19 +119,25 @@ ref_years = "1985-1986",
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
 sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tropical_subseasonal",
 short_name = "v3.LR.historical_0051"
-# Match obs_ts
-streamflow_obs_ts = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/"
-tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
 ts_daily_subsection = "atm_daily_180x360_aave"
 ts_num_years = 2
 ts_subsection = "atm_monthly_180x360_aave"
 walltime = "5:00:00"
 years = "1987:1989:2"
+# Reference paths
+# Used for mvo and mvm, if ts_num_years is set
+obs_ts = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/"
+# mvo & mvm tc_analysis only
+tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
 
   [[ atm_monthly_180x360_aave ]]
-  # Match reference_data_path
-  #dc_obs_climo = "/lcrc/group/e3sm/diagnostics/observations/Atm/climatology/"
+  # Reference paths
+  reference_data_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/climatology/"
+  # mvo diurnal_cycle only
+  # NOTE: This is NOT the guess zppy would have made!
   dc_obs_climo = '/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/obs/climatology'
+  # mvo streamflow only
+  streamflow_obs_ts = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/"
 
   [[ atm_monthly_180x360_aave_mvm ]]
   # Test model-vs-model using the same files as the reference
@@ -144,12 +145,22 @@ years = "1987:1989:2"
   partition = "compute"
   qos = "regular"
   ref_name = "v3.LR.historical_0051"
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   short_ref_name = "same simulation"
   swap_test_ref = False
   tag = "model_vs_model"
   ts_num_years_ref = 2
+  # Reference paths
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  # mvm streamflow only
+  gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
+  reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v12/v3.LR.historical_0051/post/rof/native/ts/monthly"
+  # mvm diurnal_cycle only
+  reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
+  # mvm "enso_diags", "qbo", "area_mean_time_series"
+  reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly"
+  # mvm tropical_subseasonal only
+  reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily"
 
   [[ lnd_monthly_mvm_lnd ]]
   # Test model-vs-model using the same files as the reference
@@ -158,13 +169,15 @@ years = "1987:1989:2"
   partition = "compute"
   qos = "regular"
   ref_name = "v3.LR.historical_0051"
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v6/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "lat_lon_land",
   short_ref_name = "same simulation"
   swap_test_ref = False
   tag = "model_vs_model"
   ts_num_years_ref = 2
+  # Reference paths
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test-pr628-20241011v12/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
+
 
 [mpas_analysis]
 active = True
diff --git a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh
old mode 100644
new mode 100755
index 7fd617f3..df94aa49
--- a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh
+++ b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh
@@ -9,13 +9,13 @@ do
     # Your output will now become the new expectation.
     # Copy output so you don't have to rerun zppy to generate the output.
     if [[ "${test_name,,}" == "comprehensive_v2" ]]; then
-      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test-pr628-20241011v6/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
+      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test-pr628-20241011v12/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
     else
-      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test-pr628-20241011v6/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
+      cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test-pr628-20241011v12/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
     fi
     if [[ "${test_name,,}" == "bundles" ]]; then
       mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
-      cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test-pr628-20241011v6/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
+      cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test-pr628-20241011v12/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
     fi
     zppy_top_level=$(pwd)
     cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
diff --git a/tests/integration/template_weekly_bundles.cfg b/tests/integration/template_weekly_bundles.cfg
index 3c8a0d64..2ade2706 100644
--- a/tests/integration/template_weekly_bundles.cfg
+++ b/tests/integration/template_weekly_bundles.cfg
@@ -95,11 +95,12 @@ years = "1985:1989:2",
   mapping_file = ""
   vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
 
-[tc_analysis]
-active = True
-bundle = "bundle3" # Let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
-scratch = "#expand scratch#zppy_weekly_bundles_scratch/#expand unique_id#/#expand case_name#"
-years = "1985:1989:2",
+# TODO: Add "tc_analysis" back in after empty dat is resolved.
+# [tc_analysis]
+# active = True
+# bundle = "bundle3" # Let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
+# scratch = "#expand scratch#zppy_weekly_bundles_scratch/#expand unique_id#/#expand case_name#"
+# years = "1985:1989:2",
 
 [e3sm_diags]
 active = True
@@ -128,7 +129,8 @@ years = "1985:1989:2",
   ref_years = "1985-1986",
   reference_data_path = "#expand user_output#zppy_weekly_bundles_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
-  sets = "polar","enso_diags","streamflow","tc_analysis",
+  # TODO: Add "tc_analysis" back in after empty dat is resolved.
+  sets = "polar","enso_diags","streamflow",
   short_ref_name = "#expand case_name#"
   swap_test_ref = False
   tag = "model_vs_model"
diff --git a/tests/integration/template_weekly_comprehensive_v2.cfg b/tests/integration/template_weekly_comprehensive_v2.cfg
index c2385b00..3d4bd746 100644
--- a/tests/integration/template_weekly_comprehensive_v2.cfg
+++ b/tests/integration/template_weekly_comprehensive_v2.cfg
@@ -11,7 +11,7 @@ output = "#expand user_output#zppy_weekly_comprehensive_v2_output/#expand unique
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_weekly_comprehensive_v2_www/#expand unique_id#"
-years = "1870:1874:2",
+years = "1980:1984:2",
 
 [climo]
 active = True
@@ -66,7 +66,7 @@ walltime = "00:30:00"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
-  years = "1870:1880:5",
+  years = "1980:1990:5",
 
   [[ lnd_monthly_glb ]]
   frequency = "monthly"
@@ -74,7 +74,7 @@ walltime = "00:30:00"
   input_subdir = "archive/lnd/hist"
   mapping_file = "glb"
   vars = "LAISHA,LAISUN"
-  years = "1870:1880:5",
+  years = "1980:1990:5",
 
   [[ land_monthly ]]
   extra_vars = "landfrac"
@@ -99,9 +99,10 @@ multiprocessing = True
 num_workers = 8
 partition = "#expand partition_long#"
 qos = "#expand qos_long#"
-ref_final_yr = 1871
-ref_start_yr = 1870
-ref_years = "1870-1871",
+ref_end_yr = 1981
+ref_final_yr = 1981
+ref_start_yr = 1980
+ref_years = "1980-1981",
 # Include all sets
 # min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
 # min_case_e3sm_diags_depend_on_ts: "enso_diags","qbo",
@@ -113,7 +114,7 @@ sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","merid
 short_name = "#expand case_name_v2#"
 ts_num_years = 2
 walltime = "#expand diags_walltime#"
-years = "1872:1874:2",
+years = "1982:1984:2",
 
   [[ atm_monthly_180x360_aave ]]
   climo_subsection = "atm_monthly_180x360_aave"
@@ -134,7 +135,7 @@ years = "1872:1874:2",
   ts_daily_subsection = "atm_monthly_180x360_aave"
   ts_num_years_ref = 2
   ts_subsection = "atm_monthly_180x360_aave"
-  years = "1870:1872:2",
+  years = "1980:1982:2",
 
   [[ lnd_monthly_mvm_lnd ]]
   # Test model-vs-model using the same files as the reference
@@ -153,28 +154,28 @@ years = "1872:1874:2",
 
 [mpas_analysis]
 active = True
-anomalyRefYear = 1870
-climo_years ="1870-1874", "1875-1880",
-enso_years = "1870-1874", "1875-1880",
+anomalyRefYear = 1980
+climo_years ="1980-1984", "1985-1990",
+enso_years = "1980-1984", "1985-1990",
 mesh = "EC30to60E2r2"
 parallelTaskCount = 6
 partition = "#expand partition_long#"
 qos = "#expand qos_long#"
 shortTermArchive = True
-ts_years = "1870-1874", "1870-1880",
+ts_years = "1980-1984", "1980-1990",
 walltime = "#expand mpas_analysis_walltime#"
 
 [global_time_series]
 active = True
-climo_years ="1870-1874", "1875-1880",
+climo_years ="1980-1984", "1985-1990",
 experiment_name = "#expand case_name_v2#"
 figstr = "#expand case_name_v2#"
-moc_file=mocTimeSeries_1870-1880.nc
+moc_file=mocTimeSeries_1980-1990.nc
 plots_lnd = "LAISHA,LAISUN"
 ts_num_years = 5
-ts_years = "1870-1874", "1870-1880",
+ts_years = "1980-1984", "1980-1990",
 walltime = "00:30:00"
-years = "1870-1880",
+years = "1980-1990",
 
 [ilamb]
 active = True
@@ -183,4 +184,4 @@ partition = "#expand partition_long#"
 short_name = "#expand case_name_v2#"
 ts_num_years = 2
 walltime = "2:00:00"
-years = "1870:1874:2",
+years = "1980:1984:2",
diff --git a/tests/integration/template_weekly_comprehensive_v3.cfg b/tests/integration/template_weekly_comprehensive_v3.cfg
index ffd4bc92..4eb511f4 100644
--- a/tests/integration/template_weekly_comprehensive_v3.cfg
+++ b/tests/integration/template_weekly_comprehensive_v3.cfg
@@ -88,10 +88,11 @@ walltime = "00:30:00"
   ts_fmt = "cmip"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
-[tc_analysis]
-active = True
-scratch = "#expand scratch#zppy_weekly_comprehensive_v3_scratch/#expand unique_id#/#expand case_name#"
-walltime = "00:30:00"
+# TODO: Add "tc_analysis" back in after empty dat is resolved.
+# [tc_analysis]
+# active = True
+# scratch = "#expand scratch#zppy_weekly_comprehensive_v3_scratch/#expand unique_id#/#expand case_name#"
+# walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
@@ -99,18 +100,12 @@ climo_diurnal_frequency = "diurnal_8xdaily"
 climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
 climo_subsection = "atm_monthly_180x360_aave"
 environment_commands = "#expand diags_environment_commands#"
-gauges_path = "#expand diagnostics_base_path#/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
-obs_ts = "#expand diagnostics_base_path#/observations/Atm/time-series/"
 partition = "#expand partition_long#"
 qos = "#expand qos_long#"
-reference_data_path = "#expand diagnostics_base_path#/observations/Atm/climatology/"
-reference_data_path_climo_diurnal = "#expand diagnostics_base_path#/observations/Atm/climatology/post/atm/180x360_aave/clim_diurnal_8xdaily"
-reference_data_path_ts = "#expand diagnostics_base_path#/atm/180x360_aave/ts/monthly"
-reference_data_path_ts_daily = "#expand diagnostics_base_path#/atm/180x360_aave/ts/daily"
-reference_data_path_ts_rof = "#expand diagnostics_base_path#/rof/native/ts/monthly"
+ref_end_yr = 1986
 ref_final_yr = 1986
 ref_start_yr = 1985
 ref_years = "1985-1986",
@@ -124,19 +119,25 @@ ref_years = "1985-1986",
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
 sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tropical_subseasonal",
 short_name = "#expand case_name#"
-# Match obs_ts
-streamflow_obs_ts = "#expand diagnostics_base_path#/observations/Atm/time-series/"
-tc_obs = "#expand diagnostics_base_path#/observations/Atm/tc-analysis/"
 ts_daily_subsection = "atm_daily_180x360_aave"
 ts_num_years = 2
 ts_subsection = "atm_monthly_180x360_aave"
 walltime = "#expand diags_walltime#"
 years = "1987:1989:2"
+# Reference paths
+# Used for mvo and mvm, if ts_num_years is set
+obs_ts = "#expand diagnostics_base_path#/observations/Atm/time-series/"
+# mvo & mvm tc_analysis only
+tc_obs = "#expand diagnostics_base_path#/observations/Atm/tc-analysis/"
 
   [[ atm_monthly_180x360_aave ]]
-  # Match reference_data_path
-  #dc_obs_climo = "#expand diagnostics_base_path#/observations/Atm/climatology/"
+  # Reference paths
+  reference_data_path = "#expand diagnostics_base_path#/observations/Atm/climatology/"
+  # mvo diurnal_cycle only
+  # NOTE: This is NOT the guess zppy would have made!
   dc_obs_climo = '/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/obs/climatology'
+  # mvo streamflow only
+  streamflow_obs_ts = "#expand diagnostics_base_path#/observations/Atm/time-series/"
 
   [[ atm_monthly_180x360_aave_mvm ]]
   # Test model-vs-model using the same files as the reference
@@ -144,12 +145,22 @@ years = "1987:1989:2"
   partition = "#expand partition_long#"
   qos = "#expand qos_long#"
   ref_name = "#expand case_name#"
-  reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   short_ref_name = "same simulation"
   swap_test_ref = False
   tag = "model_vs_model"
   ts_num_years_ref = 2
+  # Reference paths
+  reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim"
+  # mvm streamflow only
+  gauges_path = "#expand diagnostics_base_path#/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
+  reference_data_path_ts_rof = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/rof/native/ts/monthly"
+  # mvm diurnal_cycle only
+  reference_data_path_climo_diurnal = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim_diurnal_8xdaily"
+  # mvm "enso_diags", "qbo", "area_mean_time_series"
+  reference_data_path_ts = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/ts/monthly"
+  # mvm tropical_subseasonal only
+  reference_data_path_ts_daily = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/ts/daily"
 
   [[ lnd_monthly_mvm_lnd ]]
   # Test model-vs-model using the same files as the reference
@@ -158,13 +169,15 @@ years = "1987:1989:2"
   partition = "#expand partition_long#"
   qos = "#expand qos_long#"
   ref_name = "#expand case_name#"
-  reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/lnd/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "lat_lon_land",
   short_ref_name = "same simulation"
   swap_test_ref = False
   tag = "model_vs_model"
   ts_num_years_ref = 2
+  # Reference paths
+  reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/lnd/180x360_aave/clim"
+
 
 [mpas_analysis]
 active = True
diff --git a/tests/integration/test_weekly.py b/tests/integration/test_weekly.py
index e3929bae..d919cafc 100644
--- a/tests/integration/test_weekly.py
+++ b/tests/integration/test_weekly.py
@@ -68,8 +68,8 @@ def test_bundles_bash_file_list(self):
                 "e3sm_diags_atm_monthly_180x360_aave_mvm_model_vs_model_1987-1988_vs_1985-1986.bash",
                 "global_time_series_1985-1995.bash",
                 "ilamb_1985-1986.bash",
-                "tc_analysis_1985-1986.bash",
-                "tc_analysis_1987-1988.bash",
+                # "tc_analysis_1985-1986.bash",
+                # "tc_analysis_1987-1988.bash",
                 "ts_atm_monthly_180x360_aave_1985-1986-0002.bash",
                 "ts_atm_monthly_180x360_aave_1987-1988-0002.bash",
                 "ts_atm_monthly_glb_1985-1989-0005.bash",
diff --git a/tests/integration/utils.py b/tests/integration/utils.py
index 6a641992..484e9fb0 100644
--- a/tests/integration/utils.py
+++ b/tests/integration/utils.py
@@ -7,7 +7,7 @@
 from mache import MachineInfo
 from PIL import Image, ImageChops, ImageDraw
 
-UNIQUE_ID = "test-pr628-20241011v6"
+UNIQUE_ID = "test-pr628-20241011v12"
 
 # Image checking ##########################################################
 
diff --git a/tests/test_zppy_e3sm_diags.py b/tests/test_zppy_e3sm_diags.py
index bbbc5fd7..53020769 100644
--- a/tests/test_zppy_e3sm_diags.py
+++ b/tests/test_zppy_e3sm_diags.py
@@ -33,6 +33,12 @@ def test_check_parameters_for_bash(self):
         c = {"sets": ["qbo"], "ref_final_yr": "2000", "ref_start_yr": ""}
         self.assertRaises(ParameterNotProvidedError, check_parameters_for_bash, c)
 
+        # tropical_subseasonal
+        c = {"sets": ["tropical_subseasonal"], "ref_end_yr": "2000"}
+        check_parameters_for_bash(c)
+        c = {"sets": ["tropical_subseasonal"], "ref_end_yr": ""}
+        self.assertRaises(ParameterNotProvidedError, check_parameters_for_bash, c)
+
     def test_check_mvm_only_parameters_for_bash(self):
         z0 = {"diff_title": "a", "ref_name": "b", "short_ref_name": "c"}
         z1 = {"diff_title": "", "ref_name": "b", "short_ref_name": "c"}
diff --git a/zppy/__main__.py b/zppy/__main__.py
index 99df8efa..4e871478 100644
--- a/zppy/__main__.py
+++ b/zppy/__main__.py
@@ -261,5 +261,5 @@ def _launch_scripts(config: ConfigObj, script_dir, job_ids_file, plugins) -> Non
                 b.export,
                 job_ids_file,
                 dependFiles=list(b.dependencies_external),
-                fail_on_dependency_skip=config["fail_on_dependency_skip"],
+                fail_on_dependency_skip=config["default"]["fail_on_dependency_skip"],
             )
diff --git a/zppy/e3sm_diags.py b/zppy/e3sm_diags.py
index fecb6be1..2ae1607e 100644
--- a/zppy/e3sm_diags.py
+++ b/zppy/e3sm_diags.py
@@ -111,6 +111,7 @@ def e3sm_diags(config: ConfigObj, script_dir: str, existing_bundles, job_ids_fil
 
 def check_parameters_for_bash(c: Dict[str, Any]) -> None:
     # Check parameters that aren't used until e3sm_diags.bash is run
+    check_required_parameters(c, set(["tropical_subseasonal"]), "ref_end_yr")
     check_required_parameters(c, set(["qbo"]), "ref_final_yr")
     check_required_parameters(c, set(["enso_diags", "qbo"]), "ref_start_yr")
     check_required_parameters(c, set(["diurnal_cycle"]), "climo_diurnal_frequency")
diff --git a/zppy/templates/default.ini b/zppy/templates/default.ini
index 9d50b7e7..9bf5bdce 100644
--- a/zppy/templates/default.ini
+++ b/zppy/templates/default.ini
@@ -163,6 +163,7 @@ output_format = string_list(default=list("png"))
 # See https://e3sm-project.github.io/e3sm_diags/_build/html/master/available-parameters.html
 output_format_subplot = string_list(default=list())
 # End year (i.e., the last year to use) for the reference data
+# Required for "tropical_subseasonal" runs
 ref_end_yr = string(default="")
 # Final year (i.e., the last available year) for the reference data
 # Required for "qbo" runs
diff --git a/zppy/templates/e3sm_diags.bash b/zppy/templates/e3sm_diags.bash
index d61d666e..b94dbd43 100644
--- a/zppy/templates/e3sm_diags.bash
+++ b/zppy/templates/e3sm_diags.bash
@@ -389,7 +389,7 @@ trop_param.short_ref_name = '{{ short_ref_name }}'
 ref_start_yr = {{ ref_start_yr }}
 ref_end_yr = {{ ref_end_yr }}
 trop_param.ref_start_yr = f'{ref_start_yr:04}'
-trop_param.ref_end_yr = f'{ref_final_yr:04}'
+trop_param.ref_end_yr = f'{ref_end_yr:04}'
 # Optionally, swap test and reference model
 if {{ swap_test_ref }}:
    trop_param.test_data_path, trop_param.reference_data_path = trop_param.reference_data_path, trop_param.test_data_path