diff --git a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg
index bdb4ab8f..a380f43f 100644
--- a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg
@@ -106,7 +106,6 @@ walltime = "00:30:00"
 # [tc_analysis]
 # # The second run should run in parallel with the first run.
 # active = True
-# scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_carryover_dependencies_scratch/unique_id/v3.LR.historical_0051"
 # walltime = "00:30:00"
 
 [e3sm_diags]
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 959cc56d..dbf72683 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
@@ -1,12 +1,12 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/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/unique_id"
@@ -14,7 +14,6 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -25,7 +24,7 @@ multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v2.LR.historical_0201"
+short_name = "v3.LR.historical_0051"
 ts_num_years = 2
 walltime = "5:00:00"
 
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 aa29ad07..cd307a9d 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
@@ -1,12 +1,12 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/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/unique_id"
@@ -14,5 +14,4 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/unique_id/v2.LR.historical_0201"
 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 870698f2..5bea95bd 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
@@ -1,13 +1,13 @@
 # Run this after _1 completes. (We need tc_analysis for the reference years).
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/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/unique_id"
@@ -15,7 +15,6 @@ years = "1995:1997:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -26,7 +25,7 @@ multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v2.LR.historical_0201"
+short_name = "v3.LR.historical_0051"
 walltime = "5:00:00"
 
     [[ atm_monthly_180x360_aave_mvm ]]
@@ -34,15 +33,15 @@ walltime = "5:00:00"
   climo_subsection = "atm_monthly_180x360_aave"
   diff_title = "Difference"
   ref_final_yr = 1986
-  ref_name = "v2.LR.historical_0201"
+  ref_name = "v3.LR.historical_0051"
   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/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   # reference_data_path_tc determined automatically
   run_type = "model_vs_model"
   sets = "tc_analysis",
-  short_ref_name = "v2.LR.historical_0201"
+  short_ref_name = "v3.LR.historical_0051"
   swap_test_ref = False
   tag = "model_vs_model"
   years = "1995-1996",
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg
index d3eacc6e..4e745b2c 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg
@@ -1,12 +1,12 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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_parallel_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/unique_id/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_parallel_www/unique_id"
@@ -14,7 +14,6 @@ years = "1985:1989:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -25,7 +24,7 @@ multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v2.LR.historical_0201"
+short_name = "v3.LR.historical_0051"
 ts_num_years = 2
 walltime = "5:00:00"
 
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg
new file mode 100644
index 00000000..20c56132
--- /dev/null
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg
@@ -0,0 +1,33 @@
+[default]
+case = "v2.LR.historical_0201"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_min_case_e3sm_diags_tc_analysis_output/unique_id/v2.LR.historical_0201"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/unique_id"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "compute"
+qos = "regular"
+short_name = "v2.LR.historical_0201"
+ts_num_years = 2
+walltime = "5:00:00"
+
+  [[ atm_monthly_180x360_aave_tc_analysis ]]
+  sets = "tc_analysis",
+  # tc_obs is determined automatically
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg
new file mode 100644
index 00000000..87ba6489
--- /dev/null
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg
@@ -0,0 +1,17 @@
+[default]
+case = "v2.LR.historical_0201"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg
new file mode 100644
index 00000000..5c93c819
--- /dev/null
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg
@@ -0,0 +1,47 @@
+# Run this after _1 completes. (We need tc_analysis for the reference years).
+[default]
+case = "v2.LR.historical_0201"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/v2.LR.historical_0201"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id"
+years = "1995:1997:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "compute"
+qos = "regular"
+short_name = "v2.LR.historical_0201"
+walltime = "5:00:00"
+
+    [[ atm_monthly_180x360_aave_mvm ]]
+  # Test model-vs-model using the same files as the reference
+  climo_subsection = "atm_monthly_180x360_aave"
+  diff_title = "Difference"
+  ref_final_yr = 1986
+  ref_name = "v2.LR.historical_0201"
+  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/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim"
+  # reference_data_path_tc determined automatically
+  run_type = "model_vs_model"
+  sets = "tc_analysis",
+  short_ref_name = "v2.LR.historical_0201"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  years = "1995-1996",
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg
new file mode 100644
index 00000000..8828e058
--- /dev/null
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg
@@ -0,0 +1,35 @@
+[default]
+case = "v2.LR.historical_0201"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_min_case_e3sm_diags_tc_analysis_parallel_output/unique_id/v2.LR.historical_0201"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/unique_id"
+years = "1985:1989:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "compute"
+qos = "regular"
+short_name = "v2.LR.historical_0201"
+ts_num_years = 2
+walltime = "5:00:00"
+
+  [[ atm_monthly_180x360_aave_tc_analysis ]]
+  # Expecting two viewers: 1985-1986, 1987-1988
+  # The generation of these two viewers should occur in parallel.
+  sets = "tc_analysis",
+  # tc_obs is determined automatically
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 41de5e34..1fb4a68f 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
@@ -1,12 +1,12 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/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/unique_id"
@@ -14,5 +14,4 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/unique_id/v2.LR.historical_0201"
 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 71880091..c397018c 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
@@ -1,14 +1,14 @@
 # Run this immediately after running _1
 
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/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/unique_id"
@@ -16,5 +16,4 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg
new file mode 100644
index 00000000..9b0f1180
--- /dev/null
+++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg
@@ -0,0 +1,17 @@
+[default]
+case = "v2.LR.historical_0201"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_min_case_tc_analysis_simultaneous_1_output/unique_id/v2.LR.historical_0201"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg
new file mode 100644
index 00000000..046fc76f
--- /dev/null
+++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg
@@ -0,0 +1,19 @@
+# Run this immediately after running _1
+
+[default]
+case = "v2.LR.historical_0201"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+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_min_case_tc_analysis_simultaneous_2_output/unique_id/v2.LR.historical_0201"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+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 942dbfa4..068899be 100644
--- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg
@@ -99,7 +99,6 @@ years = "1985:1989:2",
 # [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/unique_id/v3.LR.historical_0051"
 # years = "1985:1989:2",
 
 [e3sm_diags]
diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
index 9050d5da..3a2e641b 100644
--- a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
@@ -86,7 +86,6 @@ walltime = "00:30:00"
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v2_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
index 88aece15..0722bb10 100644
--- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
@@ -91,7 +91,6 @@ 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/unique_id/v3.LR.historical_0051"
 # walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/template_min_case_carryover_dependencies.cfg b/tests/integration/template_min_case_carryover_dependencies.cfg
index 4d0fc037..8981b443 100644
--- a/tests/integration/template_min_case_carryover_dependencies.cfg
+++ b/tests/integration/template_min_case_carryover_dependencies.cfg
@@ -106,7 +106,6 @@ walltime = "00:30:00"
 # [tc_analysis]
 # # The second run should run in parallel with the first run.
 # active = True
-# scratch = "#expand scratch#zppy_min_case_carryover_dependencies_scratch/#expand unique_id#/#expand case_name#"
 # walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg
index eefb73a8..c9895df6 100644
--- a/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg
@@ -1,12 +1,12 @@
 [default]
-case = "#expand case_name_v2#"
+case = "#expand case_name#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
-input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_output/#expand unique_id#/#expand case_name_v2#"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_output/#expand unique_id#/#expand case_name#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_www/#expand unique_id#"
@@ -14,7 +14,6 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -25,7 +24,7 @@ multiprocessing = True
 num_workers = 8
 partition = "#expand partition_long#"
 qos = "#expand qos_long#"
-short_name = "#expand case_name_v2#"
+short_name = "#expand case_name#"
 ts_num_years = 2
 walltime = "#expand diags_walltime#"
 
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg
index 1eb6be42..c068e382 100644
--- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg
@@ -1,12 +1,12 @@
 [default]
-case = "#expand case_name_v2#"
+case = "#expand case_name#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
-input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name_v2#"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/#expand unique_id#"
@@ -14,5 +14,4 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg
index 80680e4e..65972e30 100644
--- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg
@@ -1,13 +1,13 @@
 # Run this after _1 completes. (We need tc_analysis for the reference years).
 [default]
-case = "#expand case_name_v2#"
+case = "#expand case_name#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
-input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/#expand unique_id#/#expand case_name_v2#"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/#expand unique_id#/#expand case_name#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/#expand unique_id#"
@@ -15,7 +15,6 @@ years = "1995:1997:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -26,7 +25,7 @@ multiprocessing = True
 num_workers = 8
 partition = "#expand partition_long#"
 qos = "#expand qos_long#"
-short_name = "#expand case_name_v2#"
+short_name = "#expand case_name#"
 walltime = "#expand diags_walltime#"
 
     [[ atm_monthly_180x360_aave_mvm ]]
@@ -34,15 +33,15 @@ walltime = "#expand diags_walltime#"
   climo_subsection = "atm_monthly_180x360_aave"
   diff_title = "Difference"
   ref_final_yr = 1986
-  ref_name = "#expand case_name_v2#"
+  ref_name = "#expand case_name#"
   ref_start_yr = 1985
   ref_years = "1985-1986",
   # Use _1 as reference
-  reference_data_path = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name_v2#/post/atm/180x360_aave/clim"
+  reference_data_path = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim"
   # reference_data_path_tc determined automatically
   run_type = "model_vs_model"
   sets = "tc_analysis",
-  short_ref_name = "#expand case_name_v2#"
+  short_ref_name = "#expand case_name#"
   swap_test_ref = False
   tag = "model_vs_model"
   years = "1995-1996",
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg
index 499ee0ac..c7952e7a 100644
--- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg
@@ -1,12 +1,12 @@
 [default]
-case = "#expand case_name_v2#"
+case = "#expand case_name#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
-input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_parallel_output/#expand unique_id#/#expand case_name_v2#"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_parallel_output/#expand unique_id#/#expand case_name#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_parallel_www/#expand unique_id#"
@@ -14,7 +14,6 @@ years = "1985:1989:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_parallel_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -25,7 +24,7 @@ multiprocessing = True
 num_workers = 8
 partition = "#expand partition_long#"
 qos = "#expand qos_long#"
-short_name = "#expand case_name_v2#"
+short_name = "#expand case_name#"
 ts_num_years = 2
 walltime = "#expand diags_walltime#"
 
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2.cfg
new file mode 100644
index 00000000..52cba8b4
--- /dev/null
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2.cfg
@@ -0,0 +1,33 @@
+[default]
+case = "#expand case_name_v2#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_output/#expand unique_id#/#expand case_name_v2#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_www/#expand unique_id#"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "#expand diags_environment_commands#"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "#expand partition_long#"
+qos = "#expand qos_long#"
+short_name = "#expand case_name_v2#"
+ts_num_years = 2
+walltime = "#expand diags_walltime#"
+
+  [[ atm_monthly_180x360_aave_tc_analysis ]]
+  sets = "tc_analysis",
+  # tc_obs is determined automatically
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg
new file mode 100644
index 00000000..808d35fa
--- /dev/null
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg
@@ -0,0 +1,17 @@
+[default]
+case = "#expand case_name_v2#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name_v2#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/#expand unique_id#"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg
new file mode 100644
index 00000000..743de4d3
--- /dev/null
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg
@@ -0,0 +1,47 @@
+# Run this after _1 completes. (We need tc_analysis for the reference years).
+[default]
+case = "#expand case_name_v2#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/#expand unique_id#/#expand case_name_v2#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/#expand unique_id#"
+years = "1995:1997:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "#expand diags_environment_commands#"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "#expand partition_long#"
+qos = "#expand qos_long#"
+short_name = "#expand case_name_v2#"
+walltime = "#expand diags_walltime#"
+
+    [[ atm_monthly_180x360_aave_mvm ]]
+  # Test model-vs-model using the same files as the reference
+  climo_subsection = "atm_monthly_180x360_aave"
+  diff_title = "Difference"
+  ref_final_yr = 1986
+  ref_name = "#expand case_name_v2#"
+  ref_start_yr = 1985
+  ref_years = "1985-1986",
+  # Use _1 as reference
+  reference_data_path = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name_v2#/post/atm/180x360_aave/clim"
+  # reference_data_path_tc determined automatically
+  run_type = "model_vs_model"
+  sets = "tc_analysis",
+  short_ref_name = "#expand case_name_v2#"
+  swap_test_ref = False
+  tag = "model_vs_model"
+  years = "1995-1996",
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_parallel.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_parallel.cfg
new file mode 100644
index 00000000..46179a59
--- /dev/null
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_parallel.cfg
@@ -0,0 +1,35 @@
+[default]
+case = "#expand case_name_v2#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_parallel_output/#expand unique_id#/#expand case_name_v2#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_parallel_www/#expand unique_id#"
+years = "1985:1989:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "#expand diags_environment_commands#"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "#expand partition_long#"
+qos = "#expand qos_long#"
+short_name = "#expand case_name_v2#"
+ts_num_years = 2
+walltime = "#expand diags_walltime#"
+
+  [[ atm_monthly_180x360_aave_tc_analysis ]]
+  # Expecting two viewers: 1985-1986, 1987-1988
+  # The generation of these two viewers should occur in parallel.
+  sets = "tc_analysis",
+  # tc_obs is determined automatically
diff --git a/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg b/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg
index 3932f753..51f2b3de 100644
--- a/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg
+++ b/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg
@@ -1,12 +1,12 @@
 [default]
-case = "#expand case_name_v2#"
+case = "#expand case_name#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
-input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_1_output/#expand unique_id#/#expand case_name_v2#"
+output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_1_output/#expand unique_id#/#expand case_name#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_tc_analysis_simultaneous_1_www/#expand unique_id#"
@@ -14,5 +14,4 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_tc_analysis_simultaneous_1_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg b/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg
index c27a1bbf..0eba3e68 100644
--- a/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg
+++ b/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg
@@ -1,14 +1,14 @@
 # Run this immediately after running _1
 
 [default]
-case = "#expand case_name_v2#"
+case = "#expand case_name#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
-input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_2_output/#expand unique_id#/#expand case_name_v2#"
+output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_2_output/#expand unique_id#/#expand case_name#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_tc_analysis_simultaneous_2_www/#expand unique_id#"
@@ -16,5 +16,4 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_tc_analysis_simultaneous_2_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_tc_analysis_v2_simultaneous_1.cfg b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_1.cfg
new file mode 100644
index 00000000..1e0ddf65
--- /dev/null
+++ b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_1.cfg
@@ -0,0 +1,17 @@
+[default]
+case = "#expand case_name_v2#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_1_output/#expand unique_id#/#expand case_name_v2#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_tc_analysis_simultaneous_1_www/#expand unique_id#"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_tc_analysis_v2_simultaneous_2.cfg b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_2.cfg
new file mode 100644
index 00000000..ad361b9d
--- /dev/null
+++ b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_2.cfg
@@ -0,0 +1,19 @@
+# Run this immediately after running _1
+
+[default]
+case = "#expand case_name_v2#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = #expand user_input#/E3SMv2/#expand case_name_v2#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_2_output/#expand unique_id#/#expand case_name_v2#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_tc_analysis_simultaneous_2_www/#expand unique_id#"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+walltime = "00:30:00"
diff --git a/tests/integration/template_weekly_bundles.cfg b/tests/integration/template_weekly_bundles.cfg
index c9a40b73..4ab9b60d 100644
--- a/tests/integration/template_weekly_bundles.cfg
+++ b/tests/integration/template_weekly_bundles.cfg
@@ -99,7 +99,6 @@ years = "1985:1989:2",
 # [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]
diff --git a/tests/integration/template_weekly_comprehensive_v2.cfg b/tests/integration/template_weekly_comprehensive_v2.cfg
index 69ca75e9..7bffe3e5 100644
--- a/tests/integration/template_weekly_comprehensive_v2.cfg
+++ b/tests/integration/template_weekly_comprehensive_v2.cfg
@@ -86,7 +86,6 @@ walltime = "00:30:00"
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_weekly_comprehensive_v2_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/template_weekly_comprehensive_v3.cfg b/tests/integration/template_weekly_comprehensive_v3.cfg
index 0a308b7d..bf66c268 100644
--- a/tests/integration/template_weekly_comprehensive_v3.cfg
+++ b/tests/integration/template_weekly_comprehensive_v3.cfg
@@ -91,7 +91,6 @@ 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]
diff --git a/tests/integration/utils.py b/tests/integration/utils.py
index 1d4fdf4f..d008fd41 100644
--- a/tests/integration/utils.py
+++ b/tests/integration/utils.py
@@ -285,6 +285,8 @@ def generate_cfgs(unified_testing=False, dry_run=False):
         "min_case_carryover_dependencies",
         "min_case_tc_analysis_simultaneous_1",
         "min_case_tc_analysis_simultaneous_2",
+        "min_case_tc_analysis_v2_simultaneous_1",
+        "min_case_tc_analysis_v2_simultaneous_2",
         "min_case_e3sm_diags_depend_on_climo_mvm_1",
         "min_case_e3sm_diags_depend_on_climo_mvm_2",
         "min_case_e3sm_diags_depend_on_climo",
@@ -303,6 +305,10 @@ def generate_cfgs(unified_testing=False, dry_run=False):
         "min_case_e3sm_diags_tc_analysis_mvm_1",
         "min_case_e3sm_diags_tc_analysis_mvm_2",
         "min_case_e3sm_diags_tc_analysis_parallel",
+        "min_case_e3sm_diags_tc_analysis_v2_mvm_1",
+        "min_case_e3sm_diags_tc_analysis_v2_mvm_2",
+        "min_case_e3sm_diags_tc_analysis_v2_parallel",
+        "min_case_e3sm_diags_tc_analysis_v2",
         "min_case_e3sm_diags_tc_analysis",
         "min_case_e3sm_diags_tropical_subseasonal_mvm_1",
         "min_case_e3sm_diags_tropical_subseasonal_mvm_2",
diff --git a/zppy/defaults/default.ini b/zppy/defaults/default.ini
index 83120818..72060bb5 100644
--- a/zppy/defaults/default.ini
+++ b/zppy/defaults/default.ini
@@ -128,6 +128,7 @@ input_component = string(default="")
 [tc_analysis]
 # NOTE: always overrides value in [default]
 input_files = string(default="eam.h2")
+# DEPRECATED. No longer used.
 # The scratch directory
 scratch = string(default="")
 
diff --git a/zppy/templates/tc_analysis.bash b/zppy/templates/tc_analysis.bash
index 55b1fcb2..53a47b34 100644
--- a/zppy/templates/tc_analysis.bash
+++ b/zppy/templates/tc_analysis.bash
@@ -29,19 +29,13 @@ start="{{ '%04d' % (year1) }}"
 end="{{ '%04d' % (year2) }}"
 caseid="{{ case }}"
 drc_in={{ input }}/{{ input_subdir }}
-# Warning: tempest-remap can only write grid file on SCRATCH space.
-# The result files will be moved to another path at the end.
-result_dir_fin={{ output }}/post/atm # Directory will be {{ output }}/post/atm/tc-analysis_${Y1}_${Y2}
-mkdir -p $result_dir_fin
 y1={{ year1 }}
 y2={{ year2 }}
 Y1="{{ '%04d' % (year1) }}"
 Y2="{{ '%04d' % (year2) }}"
-result_dir={{ scratch }}/tc-analysis_${Y1}_${Y2}/
+result_dir={{ output }}/post/atm/tc-analysis_${Y1}_${Y2}/
 
-# Avoid "unable to remove target: Directory not empty" errors on `mv $result_dir $result_dir_fin` below.
 rm -rf ${result_dir}
-rm -rf ${result_dir_fin}/tc-analysis_${Y1}_${Y2}
 
 atm_name={{ atm_name }}
 
@@ -64,12 +58,15 @@ mkdir -p $result_dir
 file_name=${caseid}_${start}_${end}
 
 # Generate mesh files (.g).
-GenerateCSMesh --res $res --alt --file ${result_dir}outCSne$res.g
-out_type="CGLL"
-# For v2 production simulation with pg2 grids:
 if $pg2; then
-    GenerateVolumetricMesh --in ${result_dir}outCSne$res.g  --out ${result_dir}outCSne$res.g --np 2 --uniform
+    # For v2 and v3 production simulation with pg2 grids:
+    GenerateCSMesh --res $res --alt --file ${result_dir}outCSMeshne$res.g
+    GenerateVolumetricMesh --in ${result_dir}outCSMeshne$res.g  --out ${result_dir}outCSne$res.g --np 2 --uniform
     out_type="FV"
+else
+    # For v1 production simulation with np4 grids:
+    GenerateCSMesh --res $res --alt --file ${result_dir}outCSne$res.g
+    out_type="CGLL"
 fi
 echo $out_type
 # Generate connectivity files (.dat)
@@ -82,7 +79,16 @@ cd ${drc_in};eval ls ${caseid}.$atm_name.h2.*{${start}..${end}}*.nc >${result_di
 cd ${result_dir}
 # Detection threshold including:
 # The sea-level pressure (SLP) must be a local minimum; SLP must have a sufficient decrease (300 Pa) compared to surrounding nodes within 4 degree radius; The average of the 200 hPa and 500 hPa level temperature decreases by 0.6 K in all directions within a 4 degree radius from the location to fSLP minima
-DetectNodes --verbosity 0 --in_connect ${result_dir}connect_CSne${res}_v2.dat --closedcontourcmd "PSL,300.0,4.0,0;_AVG(T200,T500),-0.6,4,0.30" --mergedist 6.0 --searchbymin PSL --outputcmd "PSL,min,0;_VECMAG(UBOT,VBOT),max,2" --timestride 1 --in_data_list ${result_dir}inputfile_${file_name}.txt --out ${result_dir}out.dat
+if [ $res == 120 ]; then
+    echo $res
+    DetectNodes --verbosity 0 --in_connect ${result_dir}connect_CSne${res}_v2.dat --closedcontourcmd "PSL,300.0,4.0,0;_AVG(T200,T500),-0.6,4,0.30" --mergedist 6.0 --searchbymin PSL --outputcmd "PSL,min,0;_VECMAG(UBOT,VBOT),max,2" --timestride 1 --in_data_list ${result_dir}inputfile_${file_name}.txt --out ${result_dir}out.dat
+elif [ $res == 30 ]; then
+    echo $res
+    DetectNodes --verbosity 0 --in_connect ${result_dir}connect_CSne${res}_v2.dat --closedcontourcmd "PSL,300.0,4.0,0;_AVG(T200,T500),-0.6,4,1.0" --mergedist 6.0 --searchbymin PSL --outputcmd "PSL,min,0;_VECMAG(UBOT,VBOT),max,2" --timestride 1 --in_data_list ${result_dir}inputfile_${file_name}.txt --out ${result_dir}out.dat
+else
+    echo “$res value not supported”
+fi
+
 
 cat ${result_dir}out.dat0* > ${result_dir}cyclones_${file_name}.txt
 
@@ -94,7 +100,7 @@ rm ${result_dir}cyclones_${file_name}.txt
 HistogramNodes --in ${result_dir}cyclones_stitch_${file_name}.dat --iloncol 2 --ilatcol 3 --out ${result_dir}cyclones_hist_${file_name}.nc
 
 # Calculate relative vorticity
-sed -i 's/.nc/_vorticity.nc/' ${result_dir}outputfile_${file_name}.txt
+sed -i 's/\.nc/_vorticity.nc/' ${result_dir}outputfile_${file_name}.txt
 VariableProcessor --in_data_list ${result_dir}inputfile_${file_name}.txt --out_data_list ${result_dir}outputfile_${file_name}.txt --var "_CURL{4,0.5}(U850,V850)" --varout "VORT" --in_connect ${result_dir}connect_CSne${res}_v2.dat
 
 DetectNodes --verbosity 0 --in_connect ${result_dir}connect_CSne${res}_v2.dat --closedcontourcmd "VORT,-5.e-6,4,0" --mergedist 2.0 --searchbymax VORT --outputcmd "VORT,max,0" --in_data_list ${result_dir}outputfile_${file_name}.txt --out ${result_dir}aew_out.dat --minlat -35.0 --maxlat 35.0
@@ -104,10 +110,10 @@ StitchNodes --in_fmt "lon,lat,VORT" --in_connect ${result_dir}connect_CSne${res}
 rm ${result_dir}aew_${file_name}.txt
 
 HistogramNodes --in ${result_dir}aew_stitch_5e-6_${file_name}.dat --iloncol 2 --ilatcol 3 --nlat 256 --nlon 512 --out ${result_dir}aew_hist_${file_name}.nc
+
 rm ${result_dir}*out.dat00*.dat
 rm ${result_dir}${caseid}*.nc
 rm ${result_dir}*.txt
-mv $result_dir $result_dir_fin
 
 # Update status file and exit
 cd {{ scriptDir }}