diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 37852f9362..650a0ddf8b 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -627,10 +627,10 @@ export NPY=97
 export NPZ=64
 export NPZP=65
 export NSTF_NAME=2,1,1,0,5
-export OUTPUT_FH="0 1 2 3 4 5 6 7 8 9 10 11 12 15 18 21 24 27 30 33 36 39 42 45 48"
-export NFHOUT=3
+export OUTPUT_FH="12 -1"
+export NFHOUT=12
 export NFHMAX_HF=12
-export NFHOUT_HF=1
+export NFHOUT_HF=6
 export IAU_OFFSET=0
 export FHZERO=6
 export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb'"
diff --git a/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN b/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
index 2205689581..640984d388 100644
--- a/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
+++ b/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
@@ -31,7 +31,5 @@ lat1:                    22.41403305
 dx:                      3000.0
 dy:                      3000.0
 
-nfhout:                  3
-nfhmax_hf:               12
-nfhout_hf:               1
+output_fh:               0 1 12
 nsout:                   -1
diff --git a/tests/parm/model_configure_regional.IN b/tests/parm/model_configure_regional.IN
index df05cf0056..b6e09d33ba 100644
--- a/tests/parm/model_configure_regional.IN
+++ b/tests/parm/model_configure_regional.IN
@@ -61,8 +61,5 @@ kchunk3d:                -1
 # dx:                       10000.0 # x-direction grid length
 # dy:                       10000.0 # y-direction grid length
 
-nfhout:                  3
-nfhmax_hf:               12
-nfhout_hf:               1
 output_fh:               @[OUTPUT_FH]
 nsout:                   -1
diff --git a/tests/rt.conf b/tests/rt.conf
index 9fa0a3e561..4cf0d2f695 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -42,12 +42,7 @@ RUN     | control_c384
 RUN     | control_c384gdas                                                                                                        | - wcoss_cray                            | fv3 |
 RUN     | control_stochy                                                                                                          |                                         | fv3 |
 RUN     | control_stochy_restart                                                                                                  |                                         |     | control_stochy
-RUN     | control_ca                                                                                                              |                                         | fv3 |
-RUN     | control_ca_restart                                                                                                      |                                         |     | control_ca
 RUN     | control_lndp                                                                                                            |                                         | fv3 |
-RUN     | control_lheatstrg                                                                                                       |                                         | fv3 |
-RUN     | control_lseaspray                                                                                                       |                                         | fv3 |
-RUN     | control_merra2                                                                                                          |                                         | fv3 |
 
 RUN     | control_p7                                                                                                              |                                         | fv3 |
 RUN     | control_restart_p7                                                                                                      |                                         |     | control_p7
@@ -76,12 +71,10 @@ RUN     | control_rrtmgp
 RUN     | control_csawmg                                                                                                          | - gaea.intel                            | fv3 |
 RUN     | control_csawmgt                                                                                                         |                                         | fv3 |
 RUN     | control_flake                                                                                                           |                                         | fv3 |
-RUN     | control_ugwpv1                                                                                                          |                                         | fv3 |
 RUN     | control_ras                                                                                                             |                                         | fv3 |
 # post results do not reproduce on cray
 RUN     | control_thompson                                                                                                        | - wcoss_cray                            | fv3 |
 RUN     | control_thompson_no_aero                                                                                                | - wcoss_cray                            | fv3 |
-RUN     | control_noahmp                                                                                                          |                                         | fv3 |
 
 RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                                         | fv3 |
 #RUN     | fv3_HAFS_v0_hwrf                                                                                                       |                                         | fv3 |
@@ -108,16 +101,11 @@ RUN     | control_2threads_debug
 RUN     | control_CubedSphereGrid_debug                                                                                           |                                         | fv3 |
 RUN     | control_wrtGauss_netcdf_parallel_debug                                                                                  |                                         | fv3 |
 RUN     | control_stochy_debug                                                                                                    |                                         | fv3 |
-RUN     | control_ca_debug                                                                                                        |                                         | fv3 |
 RUN     | control_lndp_debug                                                                                                      |                                         | fv3 |
-RUN     | control_lheatstrg_debug                                                                                                 |                                         | fv3 |
-RUN     | control_merra2_debug                                                                                                    |                                         | fv3 |
 RUN     | control_rrtmgp_debug                                                                                                    |                                         | fv3 |
 RUN     | control_csawmg_debug                                                                                                    |                                         | fv3 |
 RUN     | control_csawmgt_debug                                                                                                   |                                         | fv3 |
-RUN     | control_ugwpv1_debug                                                                                                    |                                         | fv3 |
 RUN     | control_ras_debug                                                                                                       |                                         | fv3 |
-RUN     | control_noahmp_debug                                                                                                    |                                         | fv3 |
 RUN     | control_diag_debug                                                                                                      |                                         | fv3 |
 RUN     | control_debug_p7                                                                                                        |                                         | fv3 |
 
@@ -134,7 +122,6 @@ RUN     | fv3_rrfs_v1alpha_debug
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_HAFS_v0_hwrf_thompson,FV3_HAFS_v0_hwrf -DDEBUG=ON                                           |                                         | fv3 |
 RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                                         | fv3 |
-#RUN     | fv3_HAFS_v0_hwrf_debug                                                                                                 |                                         | fv3 |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                                         | fv3 |
 
 #COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_2017_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                      |                                         | fv3 |
@@ -153,25 +140,6 @@ RUN     | hafs_regional_docn
 RUN     | hafs_regional_docn_oisst                                                                                                | - wcoss_cray wcoss2                     | fv3 |
 RUN     | hafs_regional_datm_cdeps                                                                                                | - wcoss_cray wcoss2                     | fv3 |
 
-###################################################################################################################################################################################
-# NEMS Data Atmosphere tests                                                                                                                                                      #
-###################################################################################################################################################################################
-
-COMPILE | -DAPP=NG-GODAS-NEMSDATM                                                                                                 | - wcoss_cray                            | fv3 |
-RUN     | datm_control_cfsr                                                                                                       | - wcoss_cray                            | fv3 |
-RUN     | datm_restart_cfsr                                                                                                       | - wcoss_cray                            |     | datm_control_cfsr
-RUN     | datm_control_gefs                                                                                                       | - wcoss_cray                            | fv3 |
-RUN     | datm_control_iau_gefs                                                                                                   | - wcoss_cray                            | fv3 |
-
-RUN     | datm_bulk_cfsr                                                                                                          | - wcoss_cray                            | fv3 |
-RUN     | datm_bulk_gefs                                                                                                          | - wcoss_cray                            | fv3 |
-
-RUN     | datm_mx025_cfsr                                                                                                         | - wcoss_cray  gaea.intel                | fv3 |
-RUN     | datm_mx025_gefs                                                                                                         | - wcoss_cray                            | fv3 |
-
-COMPILE | -DAPP=NG-GODAS-NEMSDATM -DDEBUG=ON                                                                                      | - wcoss_cray                            | fv3 |
-RUN     | datm_debug_cfsr                                                                                                         | - wcoss_cray                            | fv3 |
-
 ###################################################################################################################################################################################
 # CDEPS Data Atmosphere tests                                                                                                                                                     #
 ###################################################################################################################################################################################
diff --git a/tests/tests/control b/tests/tests/control
index e8bb05bc05..1a15fefcb9 100644
--- a/tests/tests/control
+++ b/tests/tests/control
@@ -66,6 +66,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
+export OUTPUT_FH='0 21 24'
 
 
 export FV3_RUN=control_run.IN
diff --git a/tests/tests/control_2threads_debug b/tests/tests/control_2threads_debug
index 8a7541e848..489651e3f8 100644
--- a/tests/tests/control_2threads_debug
+++ b/tests/tests/control_2threads_debug
@@ -25,6 +25,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
 export FHMAX=01
+export OUTPUT_FH="0 1"
 
 export THRD=2
 export TASKS=$TASKS_thrd
diff --git a/tests/tests/control_CubedSphereGrid_debug b/tests/tests/control_CubedSphereGrid_debug
index 8343ee1a8d..ec542e20ac 100644
--- a/tests/tests/control_CubedSphereGrid_debug
+++ b/tests/tests/control_CubedSphereGrid_debug
@@ -45,6 +45,7 @@ export FHMAX=1
 export OUTPUT_GRID='cubed_sphere_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16
diff --git a/tests/tests/control_c192 b/tests/tests/control_c192
index cd82f04f3b..01f74444e2 100644
--- a/tests/tests/control_c192
+++ b/tests/tests/control_c192
@@ -30,7 +30,7 @@ export SYEAR=2021
 export SMONTH=03
 export SDAY=22
 export SHOUR=06
-export RESTART_INTERVAL=0
+export RESTART_INTERVAL=48
 export CDMBWD=${CDMBWD_c192}
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
diff --git a/tests/tests/control_c384 b/tests/tests/control_c384
index a4f9ca4fd5..9a234ca4f1 100644
--- a/tests/tests/control_c384
+++ b/tests/tests/control_c384
@@ -42,6 +42,7 @@ export WRITE_DOPOST=.true.
 export IAER=5111
 export IMO=1536
 export JMO=768
+export OUTPUT_FH="6 -1"
 
 export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
 export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav
index b1a0ffeecb..240517fc07 100644
--- a/tests/tests/control_c384gdas_wav
+++ b/tests/tests/control_c384gdas_wav
@@ -86,7 +86,7 @@ export SMONTH=03
 export SDAY=21
 export SHOUR=18
 export FHROT=3
-export FDIAG=3
+export OUTPUT_FH="3 -1"
 export NFHMAX_HF=0
 export IAU_OFFSET=6
 export CDMBWD=${CDMBWD_c384}
diff --git a/tests/tests/control_ca b/tests/tests/control_ca
deleted file mode 100644
index e78a1fde9d..0000000000
--- a/tests/tests/control_ca
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################
-#
-#  Global control with ca test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control with ca results with previous trunk version"
-
-export CNTL_DIR=control_ca
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf012.nc \
-                   atmf000.nc \
-                   atmf012.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF12 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF12"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export RESTART_INTERVAL=6
-export FHMAX=12
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-export IAER=5111
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control_ca.nml.IN
-
-export DO_CA=.true.
-export CA_SGS=.true.
-export CA_GLOBAL=.true.
-export NLIVES=24
-export NSEED=100
-export NTHRESH=8
-export CA_SMOOTH=.true.
-export NSPINUP=100
-export ISEED_CA=12345
-export NSMOOTH=100
-export CA_AMPLITUDE=0.35
-export LNDP_VAR_LIST="'XXX'"
-export LNDP_PRT_LIST=-9999
-export RCELL=${RCELL_c96}
diff --git a/tests/tests/control_ca_debug b/tests/tests/control_ca_debug
deleted file mode 100644
index 86b232f675..0000000000
--- a/tests/tests/control_ca_debug
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-#
-#  Global control debug with ca test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control debug with ca results with previous trunk version"
-
-export CNTL_DIR=control_ca_debug
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf001.nc \
-                   atmf000.nc \
-                   atmf001.nc"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export FHMAX=1
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export IAER=5111
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control_ca.nml.IN
-
-export DO_CA=.true.
-export CA_SGS=.true.
-export CA_GLOBAL=.true.
-export NLIVES=24
-export NSEED=100
-export NTHRESH=8
-export CA_SMOOTH=.true.
-export NSPINUP=100
-export ISEED_CA=12345
-export NSMOOTH=100
-export CA_AMPLITUDE=0.35
-export RCELL=${RCELL_c96}
-export LNDP_VAR_LIST="'XXX'"
-export LNDP_PRT_LIST=-9999
diff --git a/tests/tests/control_csawmg_debug b/tests/tests/control_csawmg_debug
index cc13d6e79a..ce060467de 100644
--- a/tests/tests/control_csawmg_debug
+++ b/tests/tests/control_csawmg_debug
@@ -23,6 +23,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export FHMAX=01
+export OUTPUT_FH="0 1"
 
 export DT_ATMOS=600
 export IAER=1011
diff --git a/tests/tests/control_csawmgt_debug b/tests/tests/control_csawmgt_debug
index ee4b61a64b..e221d226ba 100644
--- a/tests/tests/control_csawmgt_debug
+++ b/tests/tests/control_csawmgt_debug
@@ -23,6 +23,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export FHMAX=01
+export OUTPUT_FH="0 1"
 
 export DT_ATMOS=450
 export IAER=111
diff --git a/tests/tests/control_debug b/tests/tests/control_debug
index 366387b367..3213e4b905 100644
--- a/tests/tests/control_debug
+++ b/tests/tests/control_debug
@@ -25,6 +25,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
 export FHMAX=1
+export OUTPUT_FH="0 1"
 #export WRITE_DOPOST=.true.
 
 
diff --git a/tests/tests/control_diag_debug b/tests/tests/control_diag_debug
index 9ce0818a24..b34335955d 100644
--- a/tests/tests/control_diag_debug
+++ b/tests/tests/control_diag_debug
@@ -25,6 +25,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
 export FHMAX=1
+export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16
diff --git a/tests/tests/control_fhzero b/tests/tests/control_fhzero
index 25b412528d..c331e46a23 100644
--- a/tests/tests/control_fhzero
+++ b/tests/tests/control_fhzero
@@ -62,6 +62,7 @@ export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
 export FHZERO=3
+export OUTPUT_FH='0 21'
 
 
 export FV3_RUN=control_run.IN
diff --git a/tests/tests/control_lheatstrg b/tests/tests/control_lheatstrg
deleted file mode 100644
index 6b09b5bff8..0000000000
--- a/tests/tests/control_lheatstrg
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-#
-#  Global control with lheatstrg test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control with lheatstrg results with previous trunk version"
-
-export CNTL_DIR=control_lheatstrg
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf024.nc \
-                   atmf000.nc \
-                   atmf024.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF24 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF24"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-export IAER=5111
-
-export LHEATSTRG=.true.
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_lheatstrg_debug b/tests/tests/control_lheatstrg_debug
deleted file mode 100644
index 3fe17126c6..0000000000
--- a/tests/tests/control_lheatstrg_debug
+++ /dev/null
@@ -1,33 +0,0 @@
-###############################################################################
-#
-#  Global control debug with lheatstrg test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control debug with lheatstrg results with previous trunk version"
-
-export CNTL_DIR=control_lheatstrg_debug
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf001.nc \
-                   atmf000.nc \
-                   atmf001.nc"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export FHMAX=1
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export IAER=5111
-
-export LHEATSTRG=.true.
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_lndp_debug b/tests/tests/control_lndp_debug
index 6fef8d081f..efb3b7a0c7 100644
--- a/tests/tests/control_lndp_debug
+++ b/tests/tests/control_lndp_debug
@@ -25,6 +25,7 @@ export FHMAX=1
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16
diff --git a/tests/tests/control_lseaspray b/tests/tests/control_lseaspray
deleted file mode 100644
index c853c0927e..0000000000
--- a/tests/tests/control_lseaspray
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-#
-#  Global control with lseaspray test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control with lseaspray results with previous trunk version"
-
-export CNTL_DIR=control_lseaspray
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf024.nc \
-                   atmf000.nc \
-                   atmf024.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF24 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF24"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=600
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-export IAER=5111
-
-export LSEASPRAY=.true.
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_merra2 b/tests/tests/control_merra2
deleted file mode 100644
index 52805bee31..0000000000
--- a/tests/tests/control_merra2
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-#
-#  Global control merra2 aerosol test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control merra2 aerosol results with previous trunk version"
-
-export CNTL_DIR=control_merra2
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf024.nc \
-                   atmf000.nc \
-                   atmf024.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF24 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF24"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-
-export USE_MERRA2=.true.
-export IAER=1011
-export NEW_DIAGTABLE='diag_table_gfsv16_merra2'
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_merra2_debug b/tests/tests/control_merra2_debug
deleted file mode 100644
index 8308076d95..0000000000
--- a/tests/tests/control_merra2_debug
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-#
-#  Global control merra2 aerosol debug test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control merra2 aerosol debug results with previous trunk version"
-
-export CNTL_DIR=control_merra2_debug
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf001.nc \
-                   atmf000.nc \
-                   atmf001.nc"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export FHMAX=1
-
-export USE_MERRA2=.true.
-export IAER=1011
-export NEW_DIAGTABLE='diag_table_gfsv16_merra2'
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_multigases b/tests/tests/control_multigases
index 039dc3016f..228fd42967 100644
--- a/tests/tests/control_multigases
+++ b/tests/tests/control_multigases
@@ -42,7 +42,7 @@ export SMONTH="01"
 export SDAY="19"
 export SHOUR="06"
 export FHMAX=06
-export OUTPUT_FH="0 1 2 3 4 5 6"
+export OUTPUT_FH="0 6"
 export NSTF_NAME=0,0,1,0,5
 export INPUT_NML=multi_gases.nml.IN
 export FV3_RUN=multigases_run.IN
diff --git a/tests/tests/control_noahmp b/tests/tests/control_noahmp
deleted file mode 100644
index af1fa687f6..0000000000
--- a/tests/tests/control_noahmp
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-#
-#  Global control with noahmp test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control with noahmp results with previous trunk version"
-
-export CNTL_DIR=control_noahmp
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf024.nc \
-                   atmf000.nc \
-                   atmf024.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF24 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF24"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export RESTART_INTERVAL=0
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-export IAER=5111
-
-export LSM=2
-export LANDICE=.false.
-export IALB=2
-export IEMS=2
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_noahmp
-export INPUT_NML=control_noahmp.nml.IN
diff --git a/tests/tests/control_noahmp_debug b/tests/tests/control_noahmp_debug
deleted file mode 100644
index 991c71b163..0000000000
--- a/tests/tests/control_noahmp_debug
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-#
-#  Global control with noahmp debug test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control with noahmp debug results with previous trunk version"
-
-export CNTL_DIR=control_noahmp_debug
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf001.nc \
-                   atmf000.nc \
-                   atmf001.nc"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=720
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export FHMAX=01
-export IAER=5111
-
-export LSM=2
-export LANDICE=.false.
-export IALB=2
-export IEMS=2
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_noahmp
-export INPUT_NML=control_noahmp.nml.IN
diff --git a/tests/tests/control_ras_debug b/tests/tests/control_ras_debug
index 3332d75eae..35b7f7de90 100644
--- a/tests/tests/control_ras_debug
+++ b/tests/tests/control_ras_debug
@@ -25,6 +25,7 @@ export FHMAX=1
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export OUTPUT_FH="0 1"
 
 export RAS=.true.
 export IMFDEEPCNV=-1
diff --git a/tests/tests/control_restart b/tests/tests/control_restart
index aa3b39bc05..b158d2c8a4 100644
--- a/tests/tests/control_restart
+++ b/tests/tests/control_restart
@@ -65,7 +65,6 @@ export EXTERNAL_IC=.false.
 export MAKE_NH=.false.
 export MOUNTAIN=.true.
 export NA_INIT=0
-export OUTPUT_FH="3 -1"
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16
diff --git a/tests/tests/control_rrtmgp_debug b/tests/tests/control_rrtmgp_debug
index 15c37a8f52..8f7f12921a 100644
--- a/tests/tests/control_rrtmgp_debug
+++ b/tests/tests/control_rrtmgp_debug
@@ -25,6 +25,7 @@ export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
 export FHMAX=1
+export OUTPUT_FH="0 1"
 
 export DO_RRTMGP=.true.
 
diff --git a/tests/tests/control_stochy b/tests/tests/control_stochy
index edff04ef4b..0366989bf1 100644
--- a/tests/tests/control_stochy
+++ b/tests/tests/control_stochy
@@ -29,6 +29,7 @@ export FHMAX=12
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
+export OUTPUT_FH='6 -1'
 export IAER=5111
 export DO_SPPT=.true.
 export DO_SHUM=.true.
diff --git a/tests/tests/control_stochy_debug b/tests/tests/control_stochy_debug
index 40287f4455..232d21817d 100644
--- a/tests/tests/control_stochy_debug
+++ b/tests/tests/control_stochy_debug
@@ -25,6 +25,7 @@ export FHMAX=1
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
+export OUTPUT_FH="0 1"
 export DO_SPPT=.true.
 export DO_SHUM=.true.
 export DO_SKEB=.true.
diff --git a/tests/tests/control_stochy_restart b/tests/tests/control_stochy_restart
index e536d62cf6..e722931aa1 100644
--- a/tests/tests/control_stochy_restart
+++ b/tests/tests/control_stochy_restart
@@ -27,6 +27,7 @@ export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
 export IAER=5111
 export FHROT=06
+export OUTPUT_FH="3 -1"
 
 export WARM_START=.true.
 export NGGPS_IC=.false.
diff --git a/tests/tests/control_thompson_debug b/tests/tests/control_thompson_debug
index 3bdd511219..a37d98565a 100644
--- a/tests/tests/control_thompson_debug
+++ b/tests/tests/control_thompson_debug
@@ -24,6 +24,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export FHMAX=1
+export OUTPUT_FH="0 1"
 
 export IMP_PHYSICS=8
 export DNATS=0
diff --git a/tests/tests/control_thompson_extdiag_debug b/tests/tests/control_thompson_extdiag_debug
index 6986a819a4..2651f9fee9 100644
--- a/tests/tests/control_thompson_extdiag_debug
+++ b/tests/tests/control_thompson_extdiag_debug
@@ -24,6 +24,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export FHMAX=1
+export OUTPUT_FH="0 1"
 
 export IMP_PHYSICS=8
 export DNATS=0
diff --git a/tests/tests/control_thompson_no_aero_debug b/tests/tests/control_thompson_no_aero_debug
index 462c4b2f1a..fb40134427 100644
--- a/tests/tests/control_thompson_no_aero_debug
+++ b/tests/tests/control_thompson_no_aero_debug
@@ -24,6 +24,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export FHMAX=1
+export OUTPUT_FH="0 1"
 
 export IMP_PHYSICS=8
 export DNATS=0
diff --git a/tests/tests/control_ugwpv1 b/tests/tests/control_ugwpv1
deleted file mode 100644
index d9f49e59ad..0000000000
--- a/tests/tests/control_ugwpv1
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################
-#
-#  Global with ugwpv1 and gsldrag
-#
-###############################################
-
-export TEST_DESCR="Compare global control with ugwpv1 and gsldrag with previous trunk version"
-
-export CNTL_DIR=control_ugwpv1
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf024.nc \
-                   atmf000.nc \
-                   atmf024.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF24 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF24"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=600
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-export IAER=5111
-
-export DO_UGWP_V1=.true.
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_ugwpv1
-export INPUT_NML=control_ugwpv1.nml.IN
diff --git a/tests/tests/control_ugwpv1_debug b/tests/tests/control_ugwpv1_debug
deleted file mode 100644
index 5120cf14c9..0000000000
--- a/tests/tests/control_ugwpv1_debug
+++ /dev/null
@@ -1,33 +0,0 @@
-###############################################
-#
-#  Global control with ugwpv1 and gsldrag debug
-#
-###############################################
-
-export TEST_DESCR="Compare global control with ugwpv1 and gsldrag debug with previous trunk version"
-
-export CNTL_DIR=control_ugwpv1_debug
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf001.nc \
-                   atmf000.nc \
-                   atmf001.nc"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=600
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export FHMAX=1
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export IAER=5111
-
-export DO_UGWP_V1=.true.
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_ugwpv1
-export INPUT_NML=control_ugwpv1.nml.IN
diff --git a/tests/tests/control_wrtGauss_netcdf_parallel_debug b/tests/tests/control_wrtGauss_netcdf_parallel_debug
index 78f8774219..3db0a9e853 100644
--- a/tests/tests/control_wrtGauss_netcdf_parallel_debug
+++ b/tests/tests/control_wrtGauss_netcdf_parallel_debug
@@ -28,6 +28,7 @@ export IAER=5111
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
 export NBITS=14
+export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16
diff --git a/tests/tests/datm_bulk_cfsr b/tests/tests/datm_bulk_cfsr
deleted file mode 100644
index 7e9bcf6416..0000000000
--- a/tests/tests/datm_bulk_cfsr
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_CFSR test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_CFSR - bulk flux test"
-
-export CNTL_DIR="datm_bulk_cfsr"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/iced.2011-10-02-00000.nc \
-                   RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"
-
-export_datm
-export DATM_SRC="CFSR"
-export FILENAME_BASE='cfsr.'
-export IATM=1760
-export JATM=880
-
-export flux_scheme='-1'
-export eps_imesh='2.5e-1'
-
-export FV3_RUN=cpld_datm_cfsr.IN
diff --git a/tests/tests/datm_bulk_gefs b/tests/tests/datm_bulk_gefs
deleted file mode 100644
index 9e19eaf5ac..0000000000
--- a/tests/tests/datm_bulk_gefs
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_GEFS test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_GEFS - bulk flux test"
-
-export CNTL_DIR="datm_bulk_gefs"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/iced.2011-10-02-00000.nc \
-                   RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc"
-
-export_datm
-export DATM_SRC="GEFS"
-export FILENAME_BASE='gefs.'
-
-export flux_scheme='-1'
-export eps_imesh='2.5e-1'
-
-export FV3_RUN=cpld_datm_gefs.IN
diff --git a/tests/tests/datm_control_cfsr b/tests/tests/datm_control_cfsr
deleted file mode 100644
index b542d9658b..0000000000
--- a/tests/tests/datm_control_cfsr
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_CFSR test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_CFSR - control "
-
-export CNTL_DIR="datm_control_cfsr"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/iced.2011-10-02-00000.nc \
-                   RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"
-
-export_datm
-export DATM_SRC="CFSR"
-export FILENAME_BASE='cfsr.'
-export IATM=1760
-export JATM=880
-export RESTART_N=12
-export eps_imesh='2.5e-1'
-export FV3_RUN=cpld_datm_cfsr.IN
diff --git a/tests/tests/datm_control_gefs b/tests/tests/datm_control_gefs
deleted file mode 100644
index 83cc234fb2..0000000000
--- a/tests/tests/datm_control_gefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_GEFS test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_GEFS - control"
-
-export CNTL_DIR="datm_control_gefs"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/iced.2011-10-02-00000.nc \
-                   RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc"
-
-export_datm
-export eps_imesh='2.5e-1'
-export FV3_RUN=cpld_datm_gefs.IN
diff --git a/tests/tests/datm_control_iau_gefs b/tests/tests/datm_control_iau_gefs
deleted file mode 100644
index f48a8a272c..0000000000
--- a/tests/tests/datm_control_iau_gefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_GEFS test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_GEFS - IAU"
-
-export CNTL_DIR="datm_control_iau_gefs"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/iced.2011-10-02-00000.nc \
-                   RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc"
-
-export_datm
-export FV3_RUN=cpld_datm_gefs.IN
-export eps_imesh='2.5e-1'
-export MOM_IAU="True"
diff --git a/tests/tests/datm_debug_cfsr b/tests/tests/datm_debug_cfsr
deleted file mode 100644
index 686b8bf92a..0000000000
--- a/tests/tests/datm_debug_cfsr
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_CFSR debug test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_CFSR - debug test "
-
-export CNTL_DIR="datm_debug_cfsr"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/iced.2011-10-01-21600.nc \
-                   RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc"
-
-export_datm
-export DATM_SRC="CFSR"
-export FILENAME_BASE='cfsr.'
-export IATM=1760
-export JATM=880
-export DAYS="0.25"
-export FHMAX="6"
-export RESTART_N=${FHMAX}
-export eps_imesh='2.5e-1'
-export FV3_RUN=cpld_datm_cfsr.IN
diff --git a/tests/tests/datm_mx025_cfsr b/tests/tests/datm_mx025_cfsr
deleted file mode 100644
index b93c663a6c..0000000000
--- a/tests/tests/datm_mx025_cfsr
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_CFSR test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_CFSR - 1/4deg ocean+ice"
-
-export CNTL_DIR="datm_mx025_cfsr"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2011-10-01-43200.nc \
-                   RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc"
-
-export_datm
-export DATM_SRC="CFSR"
-export FILENAME_BASE='cfsr.'
-export IATM=1760
-export JATM=880
-export DAYS="0.5"
-export FHMAX=12
-export RESTART_N=${FHMAX}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-
-export TASKS=$TASKS_datm_025
-export TPN=$TPN_datm_025
-export atm_petlist_bounds=$APB_datm_025
-export med_petlist_bounds=$MPB_datm_025
-export ocn_petlist_bounds=$OPB_datm_025
-export ice_petlist_bounds=$IPB_datm_025
-
-# atm/ocn/ice resolution
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM='"seawifs-clim-1997-2010.1440x1080.v20180328.nc"'
-export MOM6_RIVER_RUNOFF='True'
-export FRUNOFF="runoff.daitren.clim.1440x1080.v20180328.nc"
-export MOM6_RESTART_SETTING='r'
-
-export FV3_RUN=cpld_datm_cfsr.IN
diff --git a/tests/tests/datm_mx025_gefs b/tests/tests/datm_mx025_gefs
deleted file mode 100644
index a7637bfc01..0000000000
--- a/tests/tests/datm_mx025_gefs
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_GEFS test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_GEFS - 1/4deg ocean+ice"
-
-export CNTL_DIR="datm_mx025_gefs"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2011-10-01-43200.nc \
-                   RESTART/DATM_GEFS.cpl.r.2011-10-01-43200.nc"
-
-export_datm
-export DAYS="0.5"
-export FHMAX=12
-export RESTART_N=${FHMAX}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-
-export TASKS=$TASKS_datm_025
-export TPN=$TPN_datm_025
-export atm_petlist_bounds=$APB_datm_025
-export med_petlist_bounds=$MPB_datm_025
-export ocn_petlist_bounds=$OPB_datm_025
-export ice_petlist_bounds=$IPB_datm_025
-
-# atm/ocn/ice resolution
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM='"seawifs-clim-1997-2010.1440x1080.v20180328.nc"'
-export MOM6_RIVER_RUNOFF='True'
-export FRUNOFF="runoff.daitren.clim.1440x1080.v20180328.nc"
-export MOM6_RESTART_SETTING='r'
-
-export FV3_RUN=cpld_datm_gefs.IN
diff --git a/tests/tests/datm_restart_cfsr b/tests/tests/datm_restart_cfsr
deleted file mode 100644
index 9758024625..0000000000
--- a/tests/tests/datm_restart_cfsr
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  DATM_MOM6_CICE_CMEPS_CFSR restart test
-#
-
-export TEST_DESCR="DATM-MOM6-CICE-CMEPS_CFSR - restart test "
-
-export CNTL_DIR="datm_control_cfsr"
-
-export LIST_FILES="RESTART/MOM.res.nc \
-                   RESTART/iced.2011-10-02-00000.nc \
-                   RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"
-
-export_datm
-export DATM_SRC="CFSR"
-export FILENAME_BASE='cfsr.'
-export IATM=1760
-export JATM=880
-export DAYS="1"
-export FHMAX="24"
-export FHROT="12"
-export WARM_START='.true.'
-export RESTART_N=$((FHMAX-$FHROT))
-export CICERUNTYPE='continue'
-export RUNTYPE='continue'
-export USE_RESTART_TIME='.true.'
-export MOM6_RESTART_SETTING="r"
-export eps_imesh='2.5e-1'
-export FV3_RUN=cpld_datm_cfsr.IN
diff --git a/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug b/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug
index 8da709541a..7036ab88d5 100644
--- a/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug
+++ b/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug
@@ -76,6 +76,7 @@ export_fv3
 export NODES=$(expr $TASKS / $TPN + 1)
 
 export FHMAX=3
+export OUTPUT_FH="0 3"
 
 DT_ATMOS="600"
 
diff --git a/tests/tests/fv3_gsd b/tests/tests/fv3_gsd
index 0e2da3b9a6..a9172c12e6 100644
--- a/tests/tests/fv3_gsd
+++ b/tests/tests/fv3_gsd
@@ -98,7 +98,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 
 export FHMAX=48
-export OUTPUT_FH="3 -1"
+export OUTPUT_FH="0 24 27 48"
 
 export DT_ATMOS="450"
 export IMP_PHYSICS=8
diff --git a/tests/tests/fv3_gsd_diag_debug b/tests/tests/fv3_gsd_diag_debug
index bfaac03022..3a68346988 100644
--- a/tests/tests/fv3_gsd_diag_debug
+++ b/tests/tests/fv3_gsd_diag_debug
@@ -58,7 +58,6 @@ export LSOIL_LSM=9
 export KICE=9
 
 
-export FDIAG=0,1,2
 export FHZERO=1
 export LDIAG3D=.true.
 export QDIAG3D=.true.
@@ -66,8 +65,6 @@ export MAX_OUTPUT_FIELDS=500
 export DIAG_TABLE_ADDITIONAL=diag_additional_gsd_dtend
 export PRINT_DIFF_PGR=.true.
 
-export FHMAX=2
-export NFHOUT=1
-export NFHMAX_HF=12
-export NFHOUT_HF=1
+export FHMAX=1
+export OUTPUT_FH="0 1 2"
 
diff --git a/tests/tests/fv3_hrrr b/tests/tests/fv3_hrrr
index 908dda989d..73843d0afa 100644
--- a/tests/tests/fv3_hrrr
+++ b/tests/tests/fv3_hrrr
@@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 
 export FHMAX=24
-export OUTPUT_FH="3 -1"
+export OUTPUT_FH="12 -1"
 
 export DT_ATMOS="600"
 export IMP_PHYSICS=8
diff --git a/tests/tests/fv3_rap b/tests/tests/fv3_rap
index a58ac32448..ff8abd45f8 100644
--- a/tests/tests/fv3_rap
+++ b/tests/tests/fv3_rap
@@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 
 export FHMAX=24
-export OUTPUT_FH="3 -1"
+export OUTPUT_FH="12 -1"
 
 export DT_ATMOS="600"
 export IMP_PHYSICS=8
diff --git a/tests/tests/fv3_rrfs_v1alpha b/tests/tests/fv3_rrfs_v1alpha
index 298f5355b4..4684d3f5d3 100644
--- a/tests/tests/fv3_rrfs_v1alpha
+++ b/tests/tests/fv3_rrfs_v1alpha
@@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 
 export FHMAX=24
-export OUTPUT_FH="3 -1"
+export OUTPUT_FH="12 -1"
 
 export DT_ATMOS="600"
 export IMP_PHYSICS=8
diff --git a/tests/tests/fv3_rrfs_v1beta b/tests/tests/fv3_rrfs_v1beta
index a4b9737ac7..39320d2950 100644
--- a/tests/tests/fv3_rrfs_v1beta
+++ b/tests/tests/fv3_rrfs_v1beta
@@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 
 export FHMAX=24
-export OUTPUT_FH="3 -1"
+export OUTPUT_FH="12 -1"
 
 export DT_ATMOS="600"
 export IMP_PHYSICS=8
diff --git a/tests/tests/hafs_regional_atm b/tests/tests/hafs_regional_atm
index df54485acb..3f6c46a28b 100644
--- a/tests/tests/hafs_regional_atm
+++ b/tests/tests/hafs_regional_atm
@@ -30,6 +30,7 @@ export DT_ATMOS=180
 export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
+export NFHOUT=3
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export OUTPUT_GRID='regional_latlon'
 export SDAY=29
diff --git a/tests/tests/regional_control_debug b/tests/tests/regional_control_debug
index d594f5b62e..82bcf61e7d 100644
--- a/tests/tests/regional_control_debug
+++ b/tests/tests/regional_control_debug
@@ -34,4 +34,4 @@ export INPUT_NML=regional.nml.IN
 export INPES=10
 export JNPES=6
 export WRITE_RESTART_WITH_BCS=.true.
-export OUTPUT_FH="1"
+export OUTPUT_FH="0 1"
diff --git a/tests/tests/regional_quilt b/tests/tests/regional_quilt
index b067508bd3..374002a582 100644
--- a/tests/tests/regional_quilt
+++ b/tests/tests/regional_quilt
@@ -35,5 +35,5 @@ export MODEL_CONFIGURE=model_configure_regional.IN
 export TASKS=68
 export INPES=10
 export JNPES=6
-export OUTPUT_FH="-1"
+export OUTPUT_FH="12 -1"
 
diff --git a/tests/tests/regional_quilt_2threads b/tests/tests/regional_quilt_2threads
index 795666404c..6405c1a409 100644
--- a/tests/tests/regional_quilt_2threads
+++ b/tests/tests/regional_quilt_2threads
@@ -37,5 +37,5 @@ export INPES=10
 export JNPES=6
 export THRD=2
 export TPN=$TPN_thrd
-export OUTPUT_FH="-1"
+export OUTPUT_FH="12 -1"
 
diff --git a/tests/tests/regional_quilt_RRTMGP b/tests/tests/regional_quilt_RRTMGP
index 67fba7cd1c..20cc2dc06c 100644
--- a/tests/tests/regional_quilt_RRTMGP
+++ b/tests/tests/regional_quilt_RRTMGP
@@ -36,4 +36,5 @@ export MODEL_CONFIGURE=model_configure_regional.IN
 
 export INPES=10
 export JNPES=6
+export OUTPUT_FH="12 -1"
 
diff --git a/tests/tests/regional_quilt_debug b/tests/tests/regional_quilt_debug
index d5170fddfc..70fc759c9c 100644
--- a/tests/tests/regional_quilt_debug
+++ b/tests/tests/regional_quilt_debug
@@ -33,5 +33,6 @@ export FHMAX=1
 export TASKS=68
 export INPES=10
 export JNPES=6
+export OUTPUT_FH="0 1"
 
 export WLCLK=30
diff --git a/tests/tests/regional_quilt_decomp b/tests/tests/regional_quilt_decomp
index 01a15a8558..9f9a50a11c 100644
--- a/tests/tests/regional_quilt_decomp
+++ b/tests/tests/regional_quilt_decomp
@@ -35,5 +35,5 @@ export MODEL_CONFIGURE=model_configure_regional.IN
 export TASKS=68
 export INPES=5
 export JNPES=12
-export OUTPUT_FH="-1"
+export OUTPUT_FH="12 -1"
 
diff --git a/tests/tests/regional_quilt_netcdf_parallel b/tests/tests/regional_quilt_netcdf_parallel
index acc181fa1a..23ac09f1df 100644
--- a/tests/tests/regional_quilt_netcdf_parallel
+++ b/tests/tests/regional_quilt_netcdf_parallel
@@ -33,4 +33,5 @@ export INPUT_NML=regional.nml.IN
 
 export INPES=10
 export JNPES=6
+export OUTPUT_FH="12 -1"
 
diff --git a/tests/tests/regional_restart b/tests/tests/regional_restart
index 333f617423..db95d77eef 100644
--- a/tests/tests/regional_restart
+++ b/tests/tests/regional_restart
@@ -42,4 +42,4 @@ export MAKE_NH=.true.
 # *DH
 export MOUNTAIN=.true.
 export NA_INIT=0
-export OUTPUT_FH="3 6 9 12 15 18 21 24"
+export OUTPUT_FH="18 24"