diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 8677f7694e..63e6a75a2b 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -490,6 +490,12 @@ export_fv3 ()
 if [[ -z ${ATMRES+x} || -z ${ATMRES} ]]; then
     export ATMRES=C96
 fi
+if [[ -z ${DT_ATMOS+x} || -z ${DT_ATMOS} ]]; then
+    export DT_ATMOS=1800
+    export default_dt_atmos=1
+else
+    export default_dt_atmos=0
+fi
 
 # ufs.configure defaults
 export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
@@ -708,7 +714,7 @@ export LAUNCH_LEVEL=54
 export KNOB_UGWP_DOKDIS=1
 export KNOB_UGWP_NDX4LH=1
 export KNOB_UGWP_VERSION=0
-export KNOB_UGWP_PALAUNCH=275.e2
+export KNOB_UGWP_PALAUNCH=275.0e2
 export KNOB_UGWP_NSLOPE=1
 export KNOB_UGWP_LZMAX=15.750e3
 export KNOB_UGWP_LZMIN=0.75e3
@@ -736,7 +742,12 @@ export DT_INNER_c768=75
 
 # set default
 export CDMBWD=${CDMBWD_c96}
-export DT_INNER=${DT_INNER_c96}
+
+if [[ ${default_dt_atmos} = 1 ]]; then 
+  export DT_INNER=${DT_INNER_c96}
+else
+  export DT_INNER=${DT_ATMOS}
+fi
 
 export ISATMEDMF=1
 export TRANS_TRAC=.true.
@@ -1072,8 +1083,13 @@ export_ugwpv1() {
   export LDIAG_UGWP=.false.
   export KNOB_UGWP_DOKDIS=2
   export KNOB_UGWP_NDX4LH=4
-
+  
   # Add updated damping and timestep variables
+  if [[ ${default_dt_atmos} = 1 ]]; then
+  echo "DPS_A"
+  echo ${default_dt_atmos}
+  echo ${DT_ATMOS}
+
   case "${ATMRES}" in
     "C48")
       export DT_ATMOS=720
@@ -1168,7 +1184,8 @@ export_ugwpv1() {
   if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
   if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
   export DT_INNER=${DT_ATMOS}
-
+  export default_dt_atmos=0
+  fi
 }
   
 
@@ -1382,13 +1399,17 @@ export SHOUR=06
 export CHOUR=06
 export FHMAX=24
 export FHROT=0
-export DT_ATMOS=720
 export QUILTING_RESTART=.false.
 export WRTTASK_PER_GROUP=${WPG_cpl_dflt}
 export WRITE_NSFLIP=.true.
 export OUTPUT_FH='6 -1'
 
 # default atm/ocn/ice resolution
+if [[ ${default_dt_atmos} = 1 ]]; then
+    #If default DT_ATMOS is being used, set to 720 for RTs
+    export DT_ATMOS=720
+    export DT_INNER=${DT_ATMOS}
+fi
 if [[ -z ${OCNRES+x} || -z ${OCNRES} ]]; then
     export OCNRES=100
 fi
@@ -1441,7 +1462,6 @@ export FV3_RUN=cpld_control_run.IN
 export TILEDFIX=.false.
 
 export FHZERO=6
-export DT_INNER=${DT_ATMOS}
 
 export IALB=2
 export IEMS=2
@@ -1472,16 +1492,16 @@ export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
 # UGWP1
-export GWD_OPT=2
-export KNOB_UGWP_NSLOPE=1
-export DO_GSL_DRAG_LS_BL=.true.
-export DO_GSL_DRAG_SS=.true.
-export DO_UGWP_V1_OROG_ONLY=.false.
-export DO_UGWP_V0_NST_ONLY=.false.
-export LDIAG_UGWP=.false.
+#export GWD_OPT=2
+#export KNOB_UGWP_NSLOPE=1
+#export DO_GSL_DRAG_LS_BL=.true.
+#export DO_GSL_DRAG_SS=.true.
+#export DO_UGWP_V1_OROG_ONLY=.false.
+#export DO_UGWP_V0_NST_ONLY=.false.
+#export LDIAG_UGWP=.false.
 
-export DO_GSL_DRAG_TOFD=.false.
-export CDMBWD=${CDMBWD_c96}
+#export DO_GSL_DRAG_TOFD=.false.
+#export CDMBWD=${CDMBWD_c96}
 
 # RRTMGP
 export DO_RRTMGP=.false.
@@ -1490,10 +1510,10 @@ export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
 # UGWD
-export DO_UGWP_V0=.true.
-export DO_UGWP_V1=.false.
-export DO_GSL_DRAG_LS_BL=.false.
-export KNOB_UGWP_VERSION=0
+#export DO_UGWP_V0=.true.
+#export DO_UGWP_V1=.false.
+#export DO_GSL_DRAG_LS_BL=.false.
+#export KNOB_UGWP_VERSION=0
 
 # CA
 export DO_CA=.true.
diff --git a/tests/tests/atm_ds2s_docn_dice b/tests/tests/atm_ds2s_docn_dice
index 79d81894cf..086c2484a7 100644
--- a/tests/tests/atm_ds2s_docn_dice
+++ b/tests/tests/atm_ds2s_docn_dice
@@ -90,6 +90,25 @@ export WRTTASK_PER_GROUP=$WPG_cpl_dflt
 
 export WAV_tasks=0
 
+# UGWP1
+export GWD_OPT=2
+export KNOB_UGWP_NSLOPE=1
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_UGWP_V1_OROG_ONLY=.false.
+export DO_UGWP_V0_NST_ONLY=.false.
+export LDIAG_UGWP=.false.
+
+export DO_GSL_DRAG_TOFD=.false.
+export CDMBWD=${CDMBWD_c96}
+
+# UGWD
+export DO_UGWP_V0=.true.
+export DO_UGWP_V1=.false.
+export DO_GSL_DRAG_LS_BL=.false.
+export KNOB_UGWP_VERSION=0
+
+
 #CDEPS settings
 export ocn_datamode=cplhist
 export DOCN_IN_CONFIGURE=global_docn_in.IN
diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
index 3612e62529..9ba5808873 100644
--- a/tests/tests/cpld_2threads_p8
+++ b/tests/tests/cpld_2threads_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -99,6 +99,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
index e97f7ce686..6ffd9712bd 100644
--- a/tests/tests/cpld_bmark_p8
+++ b/tests/tests/cpld_bmark_p8
@@ -53,8 +53,8 @@ export LIST_FILES="sfcf006.nc \
 export ATMRES=C384
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2013
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
index f74c38ab13..a5cae9923e 100644
--- a/tests/tests/cpld_control_c192_p8
+++ b/tests/tests/cpld_control_c192_p8
@@ -58,8 +58,11 @@ export LIST_FILES="sfcf030.tile1.nc \
 
 export ATMRES=C192
 export_fv3
+export_ugwpv1
 export_cpl
 
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
+
 export DAYS=1.25
 export FHMAX=30
 export RESTART_N=15
diff --git a/tests/tests/cpld_control_c48 b/tests/tests/cpld_control_c48
index 2f34b561ac..0f86ec5d5b 100644
--- a/tests/tests/cpld_control_c48
+++ b/tests/tests/cpld_control_c48
@@ -55,9 +55,8 @@ export LIST_FILES="sfcf024.tile1.nc \
 export ATMRES=C48
 
 export_fv3
-export_cpl
 export_ugwpv1
-
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
diff --git a/tests/tests/cpld_control_ciceC_p8 b/tests/tests/cpld_control_ciceC_p8
index e3c1a9f462..98e89ee96c 100644
--- a/tests/tests/cpld_control_ciceC_p8
+++ b/tests/tests/cpld_control_ciceC_p8
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -90,6 +90,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17
index 98b9f8a077..f45660cbfb 100644
--- a/tests/tests/cpld_control_gfsv17
+++ b/tests/tests/cpld_control_gfsv17
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0
diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau
index a85cc6adad..aea661342f 100644
--- a/tests/tests/cpld_control_gfsv17_iau
+++ b/tests/tests/cpld_control_gfsv17_iau
@@ -51,8 +51,8 @@ export LIST_FILES="sfcf024.nc \
                    20210323.120000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0
diff --git a/tests/tests/cpld_control_noaero_p8 b/tests/tests/cpld_control_noaero_p8
index e918aa1f63..0d2ab926c2 100644
--- a/tests/tests/cpld_control_noaero_p8
+++ b/tests/tests/cpld_control_noaero_p8
@@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
diff --git a/tests/tests/cpld_control_nowave_noaero_p8 b/tests/tests/cpld_control_nowave_noaero_p8
index 0647cd8e79..b69ffa4a10 100644
--- a/tests/tests/cpld_control_nowave_noaero_p8
+++ b/tests/tests/cpld_control_nowave_noaero_p8
@@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
 #TODO: add comparison of CA restart files?
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
index fcb57d70fe..8e3de505dd 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -92,6 +92,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_control_p8.v2.sfc b/tests/tests/cpld_control_p8.v2.sfc
index b754f76072..a784e7d3a4 100644
--- a/tests/tests/cpld_control_p8.v2.sfc
+++ b/tests/tests/cpld_control_p8.v2.sfc
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -93,6 +93,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_control_p8_faster b/tests/tests/cpld_control_p8_faster
index 5a751b24d8..75f8a38c13 100644
--- a/tests/tests/cpld_control_p8_faster
+++ b/tests/tests/cpld_control_p8_faster
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -88,6 +88,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_UGWP_V0=.false.
diff --git a/tests/tests/cpld_control_p8_mixedmode b/tests/tests/cpld_control_p8_mixedmode
index 10669918f3..d4dde80ee2 100644
--- a/tests/tests/cpld_control_p8_mixedmode
+++ b/tests/tests/cpld_control_p8_mixedmode
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -88,6 +88,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
index 7f87778cf7..8f7fdeefa8 100644
--- a/tests/tests/cpld_control_pdlib_p8
+++ b/tests/tests/cpld_control_pdlib_p8
@@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -112,6 +112,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_control_qr_p8 b/tests/tests/cpld_control_qr_p8
index a79b1a6d82..a685fe5fb1 100644
--- a/tests/tests/cpld_control_qr_p8
+++ b/tests/tests/cpld_control_qr_p8
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export QUILTING_RESTART=.true.
@@ -89,6 +89,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_control_sfs b/tests/tests/cpld_control_sfs
index e1d0581285..0cefb39256 100644
--- a/tests/tests/cpld_control_sfs
+++ b/tests/tests/cpld_control_sfs
@@ -18,8 +18,8 @@ export LIST_FILES="sfcf021.nc \
                    RESTART/20210323.060000.MOM.res.nc" 
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0
diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17
index 1f64f8b861..c46894b6bf 100644
--- a/tests/tests/cpld_debug_gfsv17
+++ b/tests/tests/cpld_debug_gfsv17
@@ -57,8 +57,8 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export FHMAX=3
 export DAYS=0.125
@@ -107,6 +107,8 @@ export DT_INNER=360
 export DT_ATMOS=360
 export K_SPLIT=2
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
index befc62f92a..c79ff40d8e 100644
--- a/tests/tests/cpld_debug_noaero_p8
+++ b/tests/tests/cpld_debug_noaero_p8
@@ -57,8 +57,8 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHMAX=3
diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
index 9267cf6f8e..1652d34b1b 100644
--- a/tests/tests/cpld_debug_p8
+++ b/tests/tests/cpld_debug_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHMAX=3
@@ -83,6 +83,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_UGWP_V0=.false.
diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
index 47b41d2da9..2f0f58a317 100644
--- a/tests/tests/cpld_debug_pdlib_p8
+++ b/tests/tests/cpld_debug_pdlib_p8
@@ -56,9 +56,10 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHMAX=3
@@ -102,8 +103,17 @@ if [[ $MACHINE_ID = hera && $RT_COMPILER = gnu ]] || [[ $MACHINE_ID = jet ]]; th
   WLCLK=50
 fi
 
+# set component and coupling timesteps due to long
+# runtime
 export K_SPLIT=2
 export N_SPLIT=5
+export XR_CNVCLD=.false.
+export CDMBGWD="0.14,1.8,1.0,1.0"
+#export CDMBGWD_GSL="20.0,2.5,1.0,1.0"
+export KNOB_UGWP_TAUAMP=3.0e-3
+export TAU=8.0
+export RF_CUTOFF=100.0
+export FV_SG_ADJ=1800
 
 # HR4 GFSv17 GWD update
 export DO_UGWP_V0=.false.
diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
index 2642cc30a2..a733220395 100644
--- a/tests/tests/cpld_decomp_p8
+++ b/tests/tests/cpld_decomp_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -93,6 +93,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17
index 36b1c81ea0..43dccd0ab7 100644
--- a/tests/tests/cpld_mpi_gfsv17
+++ b/tests/tests/cpld_mpi_gfsv17
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0
diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
index fcf8316ab0..d48dc4a6b3 100644
--- a/tests/tests/cpld_mpi_p8
+++ b/tests/tests/cpld_mpi_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -93,6 +93,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_mpi_pdlib_p8 b/tests/tests/cpld_mpi_pdlib_p8
index c3879bf706..84bf5315ad 100644
--- a/tests/tests/cpld_mpi_pdlib_p8
+++ b/tests/tests/cpld_mpi_pdlib_p8
@@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -111,6 +111,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
index 3dd9c46610..64e12f36f3 100644
--- a/tests/tests/cpld_restart_bmark_p8
+++ b/tests/tests/cpld_restart_bmark_p8
@@ -52,8 +52,8 @@ export LIST_FILES="sfcf006.nc \
                    20130401.060000.out_grd.ww3 "
 export ATMRES=C384
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2013
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
index 1fa0e6e9a0..54c2da4572 100644
--- a/tests/tests/cpld_restart_c192_p8
+++ b/tests/tests/cpld_restart_c192_p8
@@ -58,7 +58,9 @@ export LIST_FILES="sfcf030.tile1.nc \
 
 export ATMRES=C192
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export DAYS=1.25
 export FHMAX=30
diff --git a/tests/tests/cpld_restart_c48 b/tests/tests/cpld_restart_c48
index 6297d59471..4803fd5f46 100644
--- a/tests/tests/cpld_restart_c48
+++ b/tests/tests/cpld_restart_c48
@@ -55,7 +55,9 @@ export LIST_FILES="sfcf006.tile1.nc \
 
 export ATMRES=C48
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2021
 export SMONTH=03
@@ -171,9 +173,5 @@ export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 export FV3_RUN=cpld_control_run.IN
 
 # HR4 GFSv17 GWD update
-export DO_UGWP_V0=.false.
-export DO_UGWP_V1=.true.
-export DO_GSL_DRAG_LS_BL=.true.
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
-export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17
index 484c29da74..a42209e229 100644
--- a/tests/tests/cpld_restart_gfsv17
+++ b/tests/tests/cpld_restart_gfsv17
@@ -59,8 +59,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0
diff --git a/tests/tests/cpld_restart_p8 b/tests/tests/cpld_restart_p8
index 9895fd9d99..e4995cade5 100644
--- a/tests/tests/cpld_restart_p8
+++ b/tests/tests/cpld_restart_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHROT=12
@@ -99,6 +99,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_restart_pdlib_p8 b/tests/tests/cpld_restart_pdlib_p8
index 6097f05559..4132978f36 100644
--- a/tests/tests/cpld_restart_pdlib_p8
+++ b/tests/tests/cpld_restart_pdlib_p8
@@ -57,8 +57,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHROT=12
@@ -115,6 +115,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_restart_qr_p8 b/tests/tests/cpld_restart_qr_p8
index 33dd3e65d0..d7a55b7c4a 100644
--- a/tests/tests/cpld_restart_qr_p8
+++ b/tests/tests/cpld_restart_qr_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export QUILTING_RESTART=.true.
@@ -96,6 +96,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
diff --git a/tests/tests/cpld_s2sa_p8 b/tests/tests/cpld_s2sa_p8
index fb827e0b83..a9fba26d01 100644
--- a/tests/tests/cpld_s2sa_p8
+++ b/tests/tests/cpld_s2sa_p8
@@ -56,7 +56,9 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
 
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
diff --git a/tests/tests/cpld_warmstart_c48 b/tests/tests/cpld_warmstart_c48
index ed61689de0..8f65c964de 100644
--- a/tests/tests/cpld_warmstart_c48
+++ b/tests/tests/cpld_warmstart_c48
@@ -55,7 +55,9 @@ export LIST_FILES="sfcf006.tile1.nc \
 
 export ATMRES=C48
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2021
 export SMONTH=03