diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
index 394173c706..82d96e0aad 100644
--- a/tests/tests/cpld_control_c192_p8
+++ b/tests/tests/cpld_control_c192_p8
@@ -17,6 +17,7 @@ export LIST_FILES="sfcf036.tile1.nc \
                    atmf036.tile4.nc \
                    atmf036.tile5.nc \
                    atmf036.tile6.nc \
+                   gocart.inst_aod.20210323_1800z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -52,7 +53,6 @@ export LIST_FILES="sfcf036.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-64800.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc \
-                   gocart.inst_aod.20210323_1800z.nc4 \
                    20210323.180000.out_grd.ww3 \
                    20210323.180000.out_pnt.ww3 "
 
@@ -64,6 +64,7 @@ export FHMAX=36
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 
+export DOMAINS_STACK_SIZE=16000000
 export TASKS=$TASKS_cpl_c192
 export TPN=$TPN_cpl_c192
 export INPES=$INPES_cpl_c192
@@ -125,6 +126,12 @@ export FNVMXC="'C192.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C192.slope_type.tileX.nc'"
 export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
 
+export CDMBWD=${CDMBWD_c192}
+export DT_INNER=${DT_INNER_c192}
+
+export CPLWAV=.true.
+export CPLWAV2ATM=.true.
+export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
 export WW3RSTDTHR=3
@@ -133,10 +140,7 @@ export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
 export CPLCHM=.true.
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=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_control_c384_p8 b/tests/tests/cpld_control_c384_p8
index 48fefd2a9f..eadc3f5d37 100644
--- a/tests/tests/cpld_control_c384_p8
+++ b/tests/tests/cpld_control_c384_p8
@@ -7,6 +7,7 @@ export CNTL_DIR="cpld_control_c384_p8"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
+                   gocart.inst_aod.20210322_1200z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -45,7 +46,6 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/MOM.res_3.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 "
 
@@ -59,6 +59,7 @@ export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH="3 -1"
 export FHZERO=3
 
+export DOMAINS_STACK_SIZE=16000000
 export TASKS=$TASKS_cpl_c384
 export TPN=$TPN_cpl_c384
 export INPES=$INPES_cpl_c384
@@ -121,6 +122,12 @@ export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C384.slope_type.tileX.nc'"
 export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 
+export CDMBWD=${CDMBWD_c384}
+export DT_INNER=${DT_INNER_c384}
+
+export CPLWAV=.true.
+export CPLWAV2ATM=.true.
+export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
 export WW3RSTDTHR=3
@@ -129,10 +136,7 @@ export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
 export CPLCHM=.true.
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=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_control_c96_p8 b/tests/tests/cpld_control_c96_p8
index 9dee6f72f3..b5570ac23f 100644
--- a/tests/tests/cpld_control_c96_p8
+++ b/tests/tests/cpld_control_c96_p8
@@ -6,7 +6,19 @@ export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C9
 
 export CNTL_DIR="cpld_control_c96_p8"
 
-export LIST_FILES="sfcf024.tile1.nc \
+export LIST_FILES="sfcf021.tile1.nc \
+                   sfcf021.tile2.nc \
+                   sfcf021.tile3.nc \
+                   sfcf021.tile4.nc \
+                   sfcf021.tile5.nc \
+                   sfcf021.tile6.nc \
+                   atmf021.tile1.nc \
+                   atmf021.tile2.nc \
+                   atmf021.tile3.nc \
+                   atmf021.tile4.nc \
+                   atmf021.tile5.nc \
+                   atmf021.tile6.nc \
+                   sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
                    sfcf024.tile3.nc \
                    sfcf024.tile4.nc \
@@ -18,6 +30,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +66,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
                    20210323.060000.out_pnt.ww3 \
-                   20210323.060000.out_grd.ww3 \
-                   20210323.060000.restart.ww3"
+                   20210323.060000.out_grd.ww3 "
 
 #TODO: add comparison of CA restart files?
 
@@ -65,6 +76,7 @@ export_cpl
 
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 21 24'
 
 export TASKS=$TASKS_cpl_c96
 export TPN=$TPN_cpl_c96
@@ -73,11 +85,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
@@ -85,6 +92,19 @@ 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
@@ -92,17 +112,8 @@ 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_control_p8 b/tests/tests/cpld_control_p8
index e44d0fbae1..c68ce14016 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -6,7 +6,19 @@ export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C9
 
 export CNTL_DIR="cpld_control_p8"
 
-export LIST_FILES="sfcf024.tile1.nc \
+export LIST_FILES="sfcf021.tile1.nc \
+                   sfcf021.tile2.nc \
+                   sfcf021.tile3.nc \
+                   sfcf021.tile4.nc \
+                   sfcf021.tile5.nc \
+                   sfcf021.tile6.nc \
+                   atmf021.tile1.nc \
+                   atmf021.tile2.nc \
+                   atmf021.tile3.nc \
+                   atmf021.tile4.nc \
+                   atmf021.tile5.nc \
+                   atmf021.tile6.nc \
+                   sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
                    sfcf024.tile3.nc \
                    sfcf024.tile4.nc \
@@ -63,6 +75,7 @@ export_cpl
 
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 21 24'
 
 export CPLCHM=.true.
 export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
diff --git a/tests/tests/cpld_debug_c96_p8 b/tests/tests/cpld_debug_c96_p8
index 542bf4aaef..69d6dabeda 100644
--- a/tests/tests/cpld_debug_c96_p8
+++ b/tests/tests/cpld_debug_c96_p8
@@ -1,5 +1,5 @@
 #
-#  cpld_control C96 P8 test
+#  cpld_debug C96 P8 test
 #
 
 export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 P8 debug"
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
index db958b52f7..e74258cb72 100644
--- a/tests/tests/cpld_restart_c192_p8
+++ b/tests/tests/cpld_restart_c192_p8
@@ -17,6 +17,7 @@ export LIST_FILES="sfcf036.tile1.nc \
                    atmf036.tile4.nc \
                    atmf036.tile5.nc \
                    atmf036.tile6.nc \
+                   gocart.inst_aod.20210323_1800z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -52,7 +53,6 @@ export LIST_FILES="sfcf036.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-64800.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc \
-                   gocart.inst_aod.20210323_1800z.nc4 \
                    20210323.180000.out_grd.ww3 \
                    20210323.180000.out_pnt.ww3 "
 
@@ -69,6 +69,7 @@ export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( $
 export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
 export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
+export DOMAINS_STACK_SIZE=16000000
 export TASKS=$TASKS_cpl_c192
 export TPN=$TPN_cpl_c192
 export INPES=$INPES_cpl_c192
@@ -130,6 +131,9 @@ export FNVMXC="'C192.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C192.slope_type.tileX.nc'"
 export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
 
+export CDMBWD=${CDMBWD_c192}
+export DT_INNER=${DT_INNER_c192}
+
 # ATM warm start
 export WARM_START=.true.
 export MAKE_NH=.false.
@@ -147,9 +151,14 @@ export USE_RESTART_TIME=.true.
 # MOM6 warm start
 export MOM6_RESTART_SETTING=r
 
+#Waves
 export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
+
+export CPLWAV=.true.
+export CPLWAV2ATM=.true.
+export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
 export WW3RSTDTHR=3
@@ -158,10 +167,7 @@ export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
 export CPLCHM=.true.
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=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_c384_p8 b/tests/tests/cpld_restart_c384_p8
index 49bb049143..6a51322eef 100644
--- a/tests/tests/cpld_restart_c384_p8
+++ b/tests/tests/cpld_restart_c384_p8
@@ -7,6 +7,7 @@ export CNTL_DIR="cpld_control_c384_p8"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
+                   gocart.inst_aod.20210322_1200z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -45,7 +46,6 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/MOM.res_3.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 "
 
@@ -59,6 +59,8 @@ export RESTART_N=$((FHMAX-$FHROT))
 export OUTPUT_FH="3 -1"
 export FHZERO=3
 
+export DOMAINS_STACK_SIZE=16000000
+
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
 export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
@@ -126,6 +128,9 @@ export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C384.slope_type.tileX.nc'"
 export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 
+export CDMBWD=${CDMBWD_c384}
+export DT_INNER=${DT_INNER_c384}
+
 # ATM warm start
 export WARM_START=.true.
 export MAKE_NH=.false.
@@ -143,9 +148,14 @@ export USE_RESTART_TIME=.true.
 # MOM6 warm start
 export MOM6_RESTART_SETTING=r
 
+# Waves
 export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
+
+export CPLWAV=.true.
+export CPLWAV2ATM=.true.
+export MOM6_USE_WAVES=True
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
 export WW3RSTDTHR=3
@@ -154,10 +164,7 @@ export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
 export CPLCHM=.true.
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=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_c96_p8 b/tests/tests/cpld_restart_c96_p8
index 5e7578d2b2..950e8cc208 100644
--- a/tests/tests/cpld_restart_c96_p8
+++ b/tests/tests/cpld_restart_c96_p8
@@ -18,6 +18,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +54,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
                    20210323.060000.out_pnt.ww3 \
-                   20210323.060000.out_grd.ww3 \
-                   20210323.060000.restart.ww3"
+                   20210323.060000.out_grd.ww3 "
 
 #TODO: add comparison of CA restart files?
 
@@ -88,6 +87,11 @@ export USE_RESTART_TIME=.true.
 # MOM6 warm start
 export MOM6_RESTART_SETTING=r
 
+# Waves
+export OUT_BEG=$RUN_BEG
+export RST_BEG=$RUN_BEG
+export RST_2_BEG=$RUN_BEG
+
 export TASKS=$TASKS_cpl_c96
 export TPN=$TPN_cpl_c96
 export INPES=$INPES_cpl_c96
@@ -95,11 +99,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
@@ -107,9 +106,19 @@ export ocn_petlist_bounds=$OPB_cpl_c96
 export ice_petlist_bounds=$IPB_cpl_c96
 export wav_petlist_bounds=$WPB_cpl_c96
 
-export OUT_BEG=$RUN_BEG
-export RST_BEG=$RUN_BEG
-export RST_2_BEG=$RUN_BEG
+# 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
@@ -117,16 +126,8 @@ 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