diff --git a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh
index ecba54ce1..af997735d 100644
--- a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh
+++ b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.GSD_RAP13km.sh b/tests/baseline_configs/config.GSD_RAP13km.sh
index 52deb86fe..d61318a11 100644
--- a/tests/baseline_configs/config.GSD_RAP13km.sh
+++ b/tests/baseline_configs/config.GSD_RAP13km.sh
@@ -1,33 +1,3 @@
-#
-# MACHINE will be set by the workflow launch script (launch_FV3LAM_-
-# wflow.sh) to value passed in as an argument to that script.
-#
-MACHINE=""
-#
-# ACCOUNT will be set by the workflow launch script (launch_FV3LAM_-
-# wflow.sh) to value passed in as an argument to that script.
-#
-ACCOUNT=""
-#
-# EXPT_SUBDIR will be set by the workflow launch script (launch_FV3LAM_-
-# wflow.sh) to a value obtained from the name of this file.
-#
-EXPT_SUBDIR=""
-#
-# USE_CRON_TO_RELAUNCH may be reset by the workflow launch script
-# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that
-# script, but in case it is not, we give it a default value here.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-#
-# CRON_RELAUNCH_INTVL_MNTS may be reset by the workflow launch script
-# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that
-# script, but in case it is not, we give it a default value here.
-#
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.community_ensemble_008mems.sh b/tests/baseline_configs/config.community_ensemble_008mems.sh
index fbf012049..8a88cbe19 100644
--- a/tests/baseline_configs/config.community_ensemble_008mems.sh
+++ b/tests/baseline_configs/config.community_ensemble_008mems.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.community_ensemble_2mems.sh b/tests/baseline_configs/config.community_ensemble_2mems.sh
index b8045d9dc..8cd6aee66 100644
--- a/tests/baseline_configs/config.community_ensemble_2mems.sh
+++ b/tests/baseline_configs/config.community_ensemble_2mems.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.nco_GSD_HRRR25km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_GSD_HRRR25km_HRRRX_RAPX.sh
index 311be7ee6..50085a569 100644
--- a/tests/baseline_configs/config.nco_GSD_HRRR25km_HRRRX_RAPX.sh
+++ b/tests/baseline_configs/config.nco_GSD_HRRR25km_HRRRX_RAPX.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh
index 4b6d80a5a..1d917253e 100644
--- a/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh
+++ b/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh
index 689d4e211..24bc2c20a 100644
--- a/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh
+++ b/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.nco_GSD_SUBCONUS3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_GSD_SUBCONUS3km_HRRRX_RAPX.sh
index 346c41b64..fbc8aa85c 100644
--- a/tests/baseline_configs/config.nco_GSD_SUBCONUS3km_HRRRX_RAPX.sh
+++ b/tests/baseline_configs/config.nco_GSD_SUBCONUS3km_HRRRX_RAPX.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.nco_conus.sh b/tests/baseline_configs/config.nco_conus.sh
index 25ceb2e67..b22581718 100644
--- a/tests/baseline_configs/config.nco_conus.sh
+++ b/tests/baseline_configs/config.nco_conus.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.nco_conus_c96.sh b/tests/baseline_configs/config.nco_conus_c96.sh
index 01f4cb74a..39d3a3c33 100644
--- a/tests/baseline_configs/config.nco_conus_c96.sh
+++ b/tests/baseline_configs/config.nco_conus_c96.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.nco_ensemble.sh b/tests/baseline_configs/config.nco_ensemble.sh
index 8b35ee2d1..8bfbb540b 100644
--- a/tests/baseline_configs/config.nco_ensemble.sh
+++ b/tests/baseline_configs/config.nco_ensemble.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.new_ESGgrid.sh b/tests/baseline_configs/config.new_ESGgrid.sh
index 2ab938c71..5f32253a3 100644
--- a/tests/baseline_configs/config.new_ESGgrid.sh
+++ b/tests/baseline_configs/config.new_ESGgrid.sh
@@ -1,33 +1,3 @@
-#
-# MACHINE will be set by the workflow launch script (launch_FV3LAM_-
-# wflow.sh) to value passed in as an argument to that script.
-#
-MACHINE=""
-#
-# ACCOUNT will be set by the workflow launch script (launch_FV3LAM_-
-# wflow.sh) to value passed in as an argument to that script.
-#
-ACCOUNT=""
-#
-# EXPT_SUBDIR will be set by the workflow launch script (launch_FV3LAM_-
-# wflow.sh) to a value obtained from the name of this file.
-#
-EXPT_SUBDIR=""
-#
-# USE_CRON_TO_RELAUNCH may be reset by the workflow launch script
-# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that
-# script, but in case it is not, we give it a default value here.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-#
-# CRON_RELAUNCH_INTVL_MNTS may be reset by the workflow launch script
-# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that
-# script, but in case it is not, we give it a default value here.
-#
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_001.sh b/tests/baseline_configs/config.regional_001.sh
index 7193756ab..01d1d2265 100644
--- a/tests/baseline_configs/config.regional_001.sh
+++ b/tests/baseline_configs/config.regional_001.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_002.sh b/tests/baseline_configs/config.regional_002.sh
index 78fa3f7d1..aa2c6b0f2 100644
--- a/tests/baseline_configs/config.regional_002.sh
+++ b/tests/baseline_configs/config.regional_002.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_003.sh b/tests/baseline_configs/config.regional_003.sh
index f99b12e02..9748fd26a 100644
--- a/tests/baseline_configs/config.regional_003.sh
+++ b/tests/baseline_configs/config.regional_003.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_004.sh b/tests/baseline_configs/config.regional_004.sh
index 414796226..d8845efe2 100644
--- a/tests/baseline_configs/config.regional_004.sh
+++ b/tests/baseline_configs/config.regional_004.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_005.sh b/tests/baseline_configs/config.regional_005.sh
index 0fe4f7bce..69ece9734 100644
--- a/tests/baseline_configs/config.regional_005.sh
+++ b/tests/baseline_configs/config.regional_005.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_006.sh b/tests/baseline_configs/config.regional_006.sh
index c43b2de5f..2a84a0fc9 100644
--- a/tests/baseline_configs/config.regional_006.sh
+++ b/tests/baseline_configs/config.regional_006.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_007.sh b/tests/baseline_configs/config.regional_007.sh
index fa268c86b..2b6e811a8 100644
--- a/tests/baseline_configs/config.regional_007.sh
+++ b/tests/baseline_configs/config.regional_007.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_008.sh b/tests/baseline_configs/config.regional_008.sh
index 305acdcf9..6c7f0eb2d 100644
--- a/tests/baseline_configs/config.regional_008.sh
+++ b/tests/baseline_configs/config.regional_008.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_009.sh b/tests/baseline_configs/config.regional_009.sh
index 66a32d23f..4225ad3c0 100644
--- a/tests/baseline_configs/config.regional_009.sh
+++ b/tests/baseline_configs/config.regional_009.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_010.sh b/tests/baseline_configs/config.regional_010.sh
index 74db51ab0..261075426 100644
--- a/tests/baseline_configs/config.regional_010.sh
+++ b/tests/baseline_configs/config.regional_010.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_011.sh b/tests/baseline_configs/config.regional_011.sh
index b0aca082b..27998adc5 100644
--- a/tests/baseline_configs/config.regional_011.sh
+++ b/tests/baseline_configs/config.regional_011.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_012.sh b/tests/baseline_configs/config.regional_012.sh
index c6eb03c61..6d6a8e07a 100644
--- a/tests/baseline_configs/config.regional_012.sh
+++ b/tests/baseline_configs/config.regional_012.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.regional_014.sh b/tests/baseline_configs/config.regional_014.sh
index e8b72d7bb..37054d45d 100644
--- a/tests/baseline_configs/config.regional_014.sh
+++ b/tests/baseline_configs/config.regional_014.sh
@@ -1,28 +1,8 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-DOT_OR_USCORE="."
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
+DOT_OR_USCORE="."
+
 PREDEF_GRID_NAME="GSD_HRRR25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
diff --git a/tests/baseline_configs/config.regional_015.sh b/tests/baseline_configs/config.regional_015.sh
index 727a543e1..7744e8171 100644
--- a/tests/baseline_configs/config.regional_015.sh
+++ b/tests/baseline_configs/config.regional_015.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.user_download_extrn_files.sh b/tests/baseline_configs/config.user_download_extrn_files.sh
index b78d8eb2a..5bce3cf6a 100644
--- a/tests/baseline_configs/config.user_download_extrn_files.sh
+++ b/tests/baseline_configs/config.user_download_extrn_files.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baseline_configs/config.user_staged_extrn_files.sh b/tests/baseline_configs/config.user_staged_extrn_files.sh
index 78fa3f7d1..aa2c6b0f2 100644
--- a/tests/baseline_configs/config.user_staged_extrn_files.sh
+++ b/tests/baseline_configs/config.user_staged_extrn_files.sh
@@ -1,23 +1,3 @@
-#
-# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required
-# inputs to the script that launces the WE2E test experiments.  That script 
-# will use those inputs to fill in the values of these variables below.
-#
-MACHINE=""
-ACCOUNT=""
-EXPT_SUBDIR=""
-#
-# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS
-# are optional inputs to the script that launces the WE2E test experiments.  
-# If one or both of these values are specified, then that script will 
-# replace the default values of these variables below with those values.
-# Otherwise, it will keep the default values.
-#
-USE_CRON_TO_RELAUNCH="TRUE"
-CRON_RELAUNCH_INTVL_MNTS="02"
-
-VERBOSE="TRUE"
-
 RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt
index f7968b3b9..16f3c29b3 100644
--- a/tests/baselines_list.txt
+++ b/tests/baselines_list.txt
@@ -2,9 +2,10 @@ FV3_RRFS_v1beta
 GSD_RAP13km
 community_ensemble_008mems
 community_ensemble_2mems
-nco_GSD_SUBCONUS3km_HRRRX_RAPX
+nco_GSD_HRRR25km_HRRRX_RAPX
 nco_GSD_HRRR3km_FV3GFS_FV3GFS
 nco_GSD_HRRR3km_HRRRX_RAPX
+nco_GSD_SUBCONUS3km_HRRRX_RAPX
 nco_conus
 nco_conus_c96
 nco_ensemble
diff --git a/tests/run_experiments.sh b/tests/run_experiments.sh
index 075e3d88f..2c91dd120 100755
--- a/tests/run_experiments.sh
+++ b/tests/run_experiments.sh
@@ -15,10 +15,10 @@ scrfunc_dir=$( dirname "${scrfunc_fp}" )
 #
 #-----------------------------------------------------------------------
 #
-# The current script should be located in the "tests" subdirectory of 
-# the workflow directory, which we denote by homerrfs.  Thus, the work-
-# flow directory (homerrfs) is the one above the directory of the cur-
-# rent script.  Set HOMRErrfs accordingly.
+# The current script should be located in the "tests" subdirectory of the 
+# workflow's top-level directory, which we denote by homerrfs.  Thus, 
+# homerrfs is the directory one level above the directory in which the 
+# current script is located.  Set homerrfs accordingly.
 #
 #-----------------------------------------------------------------------
 #
@@ -65,6 +65,9 @@ valid_args=( \
 "account" \
 "use_cron_to_relaunch" \
 "cron_relaunch_intvl_mnts" \
+"stmp" \
+"ptmp" \
+"verbose" \
 )
 process_args valid_args "$@"
 #
@@ -141,6 +144,14 @@ fi
 #
 #-----------------------------------------------------------------------
 #
+# Source the default workflow configuration file.
+#
+#-----------------------------------------------------------------------
+#
+. ${ushdir}/config_defaults.sh
+#
+#-----------------------------------------------------------------------
+#
 # Get the full path to the experiments list file and verify that it exists.
 #
 #-----------------------------------------------------------------------
@@ -382,7 +393,7 @@ fi
 # baseline and the experiment.
 #
   expt_config_fp="$ushdir/config.${expt_name}.sh"
-  cp_vrfy "${baseline_config_fp}" "${expt_config_fp}"
+#  cp_vrfy "${baseline_config_fp}" "${expt_config_fp}"
 #
 #-----------------------------------------------------------------------
 #
@@ -391,15 +402,61 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-  set_bash_param "${expt_config_fp}" "EXPT_SUBDIR" "${expt_subdir}"
+#  set_bash_param "${expt_config_fp}" "EXPT_SUBDIR" "${expt_subdir}"
+#
+#-----------------------------------------------------------------------
+#
+# Source the experiment configuration file.
 #
 #-----------------------------------------------------------------------
 #
+#  . ${expt_config_fp}
+#
+#-----------------------------------------------------------------------
+#
+# Source the experiment baseline configuration file.
+#
+#-----------------------------------------------------------------------
 #
+  . ${baseline_config_fp}
+#
+#-----------------------------------------------------------------------
+#
+# Set MACHINE, ACCOUNT, and EXPT_SUBDIR using the values provided on the 
+# command line or set above.  These override any values set in the default 
+# workflow configuration file sourced above.  Then write them to the actual 
+# workflow configuration file for the test.
 #
 #-----------------------------------------------------------------------
 #
   MACHINE="${machine^^}"
+  ACCOUNT="${account}"
+  EXPT_SUBDIR="${expt_subdir}"
+  USE_CRON_TO_RELAUNCH=${use_cron_to_relaunch:-"TRUE"}
+  CRON_RELAUNCH_INTVL_MNTS=${cron_relaunch_intvl_mnts:-"02"}
+  VERBOSE=${verbose:-"TRUE"}
+
+  { cat << EOM >> ${expt_config_fp}
+#
+# The machine and account.
+#
+MACHINE="${MACHINE}"
+ACCOUNT="${ACCOUNT}"
+EXPT_SUBDIR="${EXPT_SUBDIR}"
+#
+# Whether or not to resubmit the worfklow to the job submission system
+# using cron.
+#
+USE_CRON_TO_RELAUNCH="${USE_CRON_TO_RELAUNCH}"
+CRON_RELAUNCH_INTVL_MNTS="${CRON_RELAUNCH_INTVL_MNTS}"
+VERBOSE="${VERBOSE}"
+
+EOM
+  } || print_err_msg_exit "\
+Heredoc (cat) command failed."
+
+# Append test-specific values to the workflow configuration file.
+  cat "${baseline_config_fp}" >> "${expt_config_fp}"
 #
 #-----------------------------------------------------------------------
 #
@@ -413,21 +470,23 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-  if [ ! -z "$machine" ]; then
-    set_bash_param "${expt_config_fp}" "MACHINE" "${MACHINE}"
-  fi
-
-  if [ ! -z "$account" ]; then
-    set_bash_param "${expt_config_fp}" "ACCOUNT" "$account"
-  fi
-
-  if [ ! -z "${use_cron_to_relaunch}" ]; then
-    set_bash_param "${expt_config_fp}" "USE_CRON_TO_RELAUNCH" "${use_cron_to_relaunch}"
-  fi
-
-  if [ ! -z "${cron_relaunch_intvl_mnts}" ]; then
-    set_bash_param "${expt_config_fp}" "CRON_RELAUNCH_INTVL_MNTS" "${cron_relaunch_intvl_mnts}"
-  fi
+##  if [ ! -z "$machine" ]; then
+##    set_bash_param "${expt_config_fp}" "MACHINE" "${MACHINE}"
+##  fi
+#  set_bash_param "${expt_config_fp}" "MACHINE" "${MACHINE}"
+##
+##  if [ ! -z "$account" ]; then
+##    set_bash_param "${expt_config_fp}" "ACCOUNT" "$account"
+##  fi
+#  set_bash_param "${expt_config_fp}" "ACCOUNT" "$account"
+#
+#  if [ ! -z "${use_cron_to_relaunch}" ]; then
+#    set_bash_param "${expt_config_fp}" "USE_CRON_TO_RELAUNCH" "${use_cron_to_relaunch}"
+#  fi
+#
+#  if [ ! -z "${cron_relaunch_intvl_mnts}" ]; then
+#    set_bash_param "${expt_config_fp}" "CRON_RELAUNCH_INTVL_MNTS" "${cron_relaunch_intvl_mnts}"
+#  fi
 #
 #-----------------------------------------------------------------------
 #
@@ -435,25 +494,6 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-# Might be better to source both config_defaults.sh and the configuration
-# file for the test.  That way, variables will have default values and 
-# we don't have to check whether or not they're set.  Also, do the sourcing
-# just once if possible instead of many times as below.
-#
-
-  PREDEF_GRID_NAME=$( 
-    . ${expt_config_fp} 
-    if [ -z "${PREDEF_GRID_NAME+x}" ]; then
-      echo ""
-    else
-      echo "${PREDEF_GRID_NAME}" 
-    fi
-  )
-#echo "PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\""
-#exit
-
-  RUN_TASK_MAKE_GRID=$( . ${expt_config_fp} ; echo "${RUN_TASK_MAKE_GRID}" )
-
   if [ ${RUN_TASK_MAKE_GRID} = "FALSE" ]; then
 
     if [ "$MACHINE" = "HERA" ]; then
@@ -486,8 +526,6 @@ with a nonzero status."
 #
 #-----------------------------------------------------------------------
 #
-  RUN_TASK_MAKE_OROG=$( . ${expt_config_fp} ; echo "${RUN_TASK_MAKE_OROG}" )
-
   if [ ${RUN_TASK_MAKE_OROG} = "FALSE" ]; then
 
     if [ "$MACHINE" = "HERA" ]; then
@@ -520,8 +558,6 @@ with a nonzero status."
 #
 #-----------------------------------------------------------------------
 #
-  RUN_TASK_MAKE_SFC_CLIMO=$( . ${expt_config_fp} ; echo "${RUN_TASK_MAKE_SFC_CLIMO}" )
-
   if [ ${RUN_TASK_MAKE_SFC_CLIMO} = "FALSE" ]; then
 
     if [ "$MACHINE" = "HERA" ]; then
@@ -547,9 +583,6 @@ the pregenerated grid files to the workflow configuration file returned
 with a nonzero status."
 
   fi
-
-#On hera:
-
 #
 #-----------------------------------------------------------------------
 #
@@ -557,8 +590,6 @@ with a nonzero status."
 #
 #-----------------------------------------------------------------------
 #
-  CCPP_PHYS_SUITE=$( . ${expt_config_fp} ; echo "${CCPP_PHYS_SUITE}" )
-
   if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
 
     if [ "$MACHINE" = "HERA" ]; then
@@ -598,31 +629,31 @@ a nonzero status."
 #
 #-----------------------------------------------------------------------
 #
-  RUN_ENVIR=$( . ${expt_config_fp} ; echo "${RUN_ENVIR}" )
-
   if [ "${RUN_ENVIR}" = "nco" ]; then
 
-# Note:  Need COMINgfs only if using FV3GFS or GSMGFS as the external 
-# model for ICs or LBCs.  Modify the logic below later.
+    nco_dirs=$( readlink -f "$homerrfs/../../nco_dirs" ) 
+    STMP=${stmp:-"${nco_dirs}/stmp"}
+    PTMP=${ptmp:-"${nco_dirs}/ptmp"}
 
-    if [ "$MACHINE" = "HERA" ]; then
-      COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS"
-      STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp"
-      PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp"
-    elif [ "$MACHINE" = "JET" ]; then
-      COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS"
-      STMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp"
-      PTMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp"
-    elif [ "$MACHINE" = "CHEYENNE" ]; then
-      COMINgfs="/glade/scratch/ketefian/NCO_dirs/COMGFS"
-      STMP="/glade/scratch/ketefian/NCO_dirs/stmp"
-      PTMP="/glade/scratch/ketefian/NCO_dirs/ptmp"
-    else
-      print_err_msg_exit "\
+    if [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ] || \
+       [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ] || \
+       [ "${EXTRN_MDL_NAME_LBCS}" = "FV3GFS" ] || \
+       [ "${EXTRN_MDL_NAME_LBCS}" = "GSMGFS" ]; then 
+
+      if [ "$MACHINE" = "HERA" ]; then
+        COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS"
+      elif [ "$MACHINE" = "JET" ]; then
+        COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS"
+      elif [ "$MACHINE" = "CHEYENNE" ]; then
+        COMINgfs="/glade/scratch/ketefian/NCO_dirs/COMGFS"
+      else
+        print_err_msg_exit "\
 The directories COMINgfs, STMP, and PTMP that need to be specified when
 running the workflow in NCO-mode (i.e. RUN_ENVIR set to \"nco\") have 
 not been specified for this machine (MACHINE):
   MACHINE= \"${MACHINE}\""
+      fi
+
     fi
 
     { cat << EOM >> ${expt_config_fp}
@@ -651,10 +682,10 @@ a nonzero status."
 
   if [ ${do_user_staged_extrn} = "TRUE" ]; then
 
-    EXTRN_MDL_NAME_ICS=$( . ${expt_config_fp} ; echo "${EXTRN_MDL_NAME_ICS}" )
-    EXTRN_MDL_NAME_LBCS=$( . ${expt_config_fp} ; echo "${EXTRN_MDL_NAME_LBCS}" )
-    FCST_LEN_HRS=$( . ${expt_config_fp} ; echo "${FCST_LEN_HRS}" )
-    LBC_SPEC_INTVL_HRS=$( . ${expt_config_fp} ; echo "${LBC_SPEC_INTVL_HRS}" )
+#    EXTRN_MDL_NAME_ICS=$( . ${expt_config_fp} ; echo "${EXTRN_MDL_NAME_ICS}" )
+#    EXTRN_MDL_NAME_LBCS=$( . ${expt_config_fp} ; echo "${EXTRN_MDL_NAME_LBCS}" )
+#    FCST_LEN_HRS=$( . ${expt_config_fp} ; echo "${FCST_LEN_HRS}" )
+#    LBC_SPEC_INTVL_HRS=$( . ${expt_config_fp} ; echo "${LBC_SPEC_INTVL_HRS}" )
 
     if [ "$MACHINE" = "HERA" ]; then
       extrn_mdl_source_baseir="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files"
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index 8eb2897f1..90b18f0fc 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -1226,7 +1226,7 @@ USE_ZMTNBLCK="false"
 #
 #-----------------------------------------------------------------------
 #
-HALO_BLEND=10
+HALO_BLEND=0
 #
 #-----------------------------------------------------------------------
 #
diff --git a/ush/setup.sh b/ush/setup.sh
index 1ed17cffe..b3cb5274e 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -1124,7 +1124,7 @@ the experiment generation script."
 
   COMOUT_BASEDIR="$COMROOT/$NET/$envir"
   check_for_preexist_dir_file "${COMOUT_BASEDIR}" "${PREEXISTING_DIR_METHOD}"
-  
+
 else
 
   FIXam="${EXPTDIR}/fix_am"
@@ -1224,6 +1224,12 @@ if [ "${USE_CCPP}" = "TRUE" ]; then
   CCPP_PHYS_SUITE_FN="suite_${CCPP_PHYS_SUITE}.xml"
   CCPP_PHYS_SUITE_IN_CCPP_FP="${UFS_WTHR_MDL_DIR}/FV3/ccpp/suites/${CCPP_PHYS_SUITE_FN}"
   CCPP_PHYS_SUITE_FP="${EXPTDIR}/${CCPP_PHYS_SUITE_FN}"
+  if [ ! -f "${CCPP_PHYS_SUITE_IN_CCPP_FP}" ]; then
+    print_err_msg_exit "\
+The CCPP suite definition file (CCPP_PHYS_SUITE_IN_CCPP_FP) does not exist
+in the local clone of the ufs-weather-model:
+  CCPP_PHYS_SUITE_IN_CCPP_FP = \"${CCPP_PHYS_SUITE_IN_CCPP_FP}\""
+  fi
 fi
 #
 #-----------------------------------------------------------------------