diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
index c877d006aa..03e4b5409b 100644
--- a/tests/tests/cpld_bmark_p8
+++ b/tests/tests/cpld_bmark_p8
@@ -64,8 +64,6 @@ export FHMAX=6
 export RESTART_N=`expr ${FHMAX} - ${FHROT}`
 export RESTART_INTERVAL="${RESTART_N} -1"
 
-export WLCLK=45
-
 export DOMAINS_STACK_SIZE=16000000
 
 export TASKS=$TASKS_cpl_bmrk_aero
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
index 82d96e0aad..d2b895ad59 100644
--- a/tests/tests/cpld_control_c192_p8
+++ b/tests/tests/cpld_control_c192_p8
@@ -134,7 +134,6 @@ export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
-export WW3RSTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
diff --git a/tests/tests/cpld_control_c384_p8 b/tests/tests/cpld_control_c384_p8
index eadc3f5d37..91b9335166 100644
--- a/tests/tests/cpld_control_c384_p8
+++ b/tests/tests/cpld_control_c384_p8
@@ -130,7 +130,6 @@ export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
-export WW3RSTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
diff --git a/tests/tests/cpld_control_c96_noaero_p8 b/tests/tests/cpld_control_c96_noaero_p8
index 8990703ff2..5b740cb9f2 100644
--- a/tests/tests/cpld_control_c96_noaero_p8
+++ b/tests/tests/cpld_control_c96_noaero_p8
@@ -96,6 +96,11 @@ export CPLWAV=.false.
 export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 export eps_imesh=2.5e-1
+export WW3RSTDTHR=3
+export WW3OUTDTHR=3
+export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
 export DIAG_TABLE=diag_table_template
 export NEMS_CONFIGURE=nems.configure.cpld.IN
diff --git a/tests/tests/cpld_control_c96_p8 b/tests/tests/cpld_control_c96_p8
index b5570ac23f..1c9dc36724 100644
--- a/tests/tests/cpld_control_c96_p8
+++ b/tests/tests/cpld_control_c96_p8
@@ -107,7 +107,6 @@ export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
-export WW3RSTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
diff --git a/tests/tests/cpld_debug_c96_p8 b/tests/tests/cpld_debug_c96_p8
index 69d6dabeda..df0d014b74 100644
--- a/tests/tests/cpld_debug_c96_p8
+++ b/tests/tests/cpld_debug_c96_p8
@@ -6,18 +6,19 @@ export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C9
 
 export CNTL_DIR="cpld_debug_c96_p8"
 
-export LIST_FILES="sfcf006.tile1.nc \
-                   sfcf006.tile2.nc \
-                   sfcf006.tile3.nc \
-                   sfcf006.tile4.nc \
-                   sfcf006.tile5.nc \
-                   sfcf006.tile6.nc \
-                   atmf006.tile1.nc \
-                   atmf006.tile2.nc \
-                   atmf006.tile3.nc \
-                   atmf006.tile4.nc \
-                   atmf006.tile5.nc \
-                   atmf006.tile6.nc \
+export LIST_FILES="sfcf003.tile1.nc \
+                   sfcf003.tile2.nc \
+                   sfcf003.tile3.nc \
+                   sfcf003.tile4.nc \
+                   sfcf003.tile5.nc \
+                   sfcf003.tile6.nc \
+                   atmf003.tile1.nc \
+                   atmf003.tile2.nc \
+                   atmf003.tile3.nc \
+                   atmf003.tile4.nc \
+                   atmf003.tile5.nc \
+                   atmf003.tile6.nc \
+                   gocart.inst_aod.20210322_0900z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -51,22 +52,18 @@ export LIST_FILES="sfcf006.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2021-03-22-43200.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc \
-                   gocart.inst_aod.20210322_1200z.nc4 \
-                   20210322.120000.out_pnt.ww3 \
-                   20210322.120000.out_grd.ww3 \
-                   20210322.120000.restart.ww3"
-
-#TODO: add comparison of CA restart files?
+                   RESTART/iced.2021-03-22-32400.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
+                   20210322.090000.out_pnt.ww3 \
+                   20210322.090000.out_grd.ww3 "
 
 export_fv3
 export_cpl
 
-export DAYS=0.25
-export FHMAX=6
-
+export FHMAX=3
+export DAYS=0.125
 export RESTART_N=${FHMAX}
+export OUTPUT_FH="3 -1"
 
 export TASKS=$TASKS_cpl_c96
 export TPN=$TPN_cpl_c96
@@ -75,11 +72,6 @@ export JNPES=$JNPES_cpl_c96
 export THRD=$THRD_cpl_c96
 export WRTTASK_PER_GROUP=$WPG_cpl_c96
 
-export NPROC_ICE=$NPROC_ICE_cpl_c96
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
 export med_petlist_bounds=$MPB_cpl_c96
 export atm_petlist_bounds=$APB_cpl_c96
 export chm_petlist_bounds=$CHM_cpl_c96
@@ -87,24 +79,27 @@ export ocn_petlist_bounds=$OPB_cpl_c96
 export ice_petlist_bounds=$IPB_cpl_c96
 export wav_petlist_bounds=$WPB_cpl_c96
 
+# atm/ocn/ice resolution
+export NPROC_ICE=$NPROC_ICE_cpl_c96
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
+
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
+
+export CPLWAV=.true.
+export CPLWAV2ATM=.true.
+export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
-export WW3RSTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
-export eps_imesh=2.5e-1
-
 export CPLCHM=.true.
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
-export TOPOEDITS=ufs.topo_edits_011818.nc
-export MOM6_ALLOW_LANDMASK_CHANGES=True
-
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
+export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
index e74258cb72..c3709365cf 100644
--- a/tests/tests/cpld_restart_c192_p8
+++ b/tests/tests/cpld_restart_c192_p8
@@ -161,7 +161,6 @@ export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
-export WW3RSTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
diff --git a/tests/tests/cpld_restart_c384_p8 b/tests/tests/cpld_restart_c384_p8
index 6a51322eef..76455c029a 100644
--- a/tests/tests/cpld_restart_c384_p8
+++ b/tests/tests/cpld_restart_c384_p8
@@ -158,7 +158,6 @@ export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
-export WW3RSTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_c96_p8
index 950e8cc208..c1e1edd830 100644
--- a/tests/tests/cpld_restart_c96_p8
+++ b/tests/tests/cpld_restart_c96_p8
@@ -121,7 +121,6 @@ export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
-export WW3RSTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"