diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
index 6e9c1f6f45..18a5d67493 100644
--- a/modulefiles/ufs_common.lua
+++ b/modulefiles/ufs_common.lua
@@ -30,3 +30,5 @@ for i = 1, #ufs_modules do
     load(pathJoin(name, os.getenv(env_version_name) or default_version))
   end
 end
+
+load("nco")
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 473f59242e..0b6a059ee4 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -419,6 +419,7 @@ export CMP_DATAONLY=false
 # Defaults for ufs.configure
 export esmf_logkind="ESMF_LOGKIND_MULTI"
 export DumpFields="false"
+export MED_history_n=1000000
 
 export_fv3_v16 ()
 {
diff --git a/tests/fv3_conf/cpld_docn_dice.IN b/tests/fv3_conf/cpld_docn_dice.IN
index e33cc3818c..1abd1be0d9 100644
--- a/tests/fv3_conf/cpld_docn_dice.IN
+++ b/tests/fv3_conf/cpld_docn_dice.IN
@@ -1,7 +1,15 @@
 mkdir -p INPUT
 
+SUFFIX=${RT_SUFFIX}
+if [[ ${OPNREQ_TEST} == true ]]; then
+  SUFFIX=${BL_SUFFIX}
+fi
+
 #CDEPS data files
-cp @[INPUTDATA_ROOT]/DOCN_DICE_cplhist/ufs.cpld.cpl*.nc INPUT
+#cp @[INPUTDATA_ROOT]/DOCN_DICE_cplhist/ufs.cpld.cpl*.nc INPUT
+#module load nco
+ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ice*nc ./INPUT/ufs.cpld.cpl.hi.ice.nc
+ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ocn*nc ./INPUT/ufs.cpld.cpl.hi.ocn.nc
 
 #CDEPS fix files - same for ocn/ice
 cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc INPUT
diff --git a/tests/parm/ufs.configure.s2s_esmf.IN b/tests/parm/ufs.configure.s2s_esmf.IN
index bf17be2a5e..1b164f1e8b 100644
--- a/tests/parm/ufs.configure.s2s_esmf.IN
+++ b/tests/parm/ufs.configure.s2s_esmf.IN
@@ -97,6 +97,10 @@ MED_attributes::
       coupling_mode = @[CPLMODE]
       pio_rearranger = @[pio_rearranger]
       ocean_albedo_limit = @[ocean_albedo_limit]
+      history_n_ice_inst = @[MED_history_n]
+      history_option_ice_inst = nhours
+      history_n_ocn_inst = @[MED_history_n]
+      history_option_ocn_inst = nhours
 ::
 
 ALLCOMP_attributes::
diff --git a/tests/rt.conf b/tests/rt.conf
index 752a082dd8..f8005e14e7 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -300,7 +300,7 @@ RUN | datm_cdeps_lnd_era5_rst                           | - wcoss2 noaacloud
 COMPILE | atm_ds2s_docn_pcice | intel | -DAPP=ATM_DS2S-PCICE  -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
 RUN | atm_ds2s_docn_pcice                                | - wcoss2 acorn noaacloud             | baseline |
 COMPILE | atm_ds2s_docn_dice | intel | -DAPP=ATM_DS2S  -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
-RUN | atm_ds2s_docn_dice                                | - wcoss2 acorn noaacloud             | baseline |
+RUN | atm_ds2s_docn_dice                                | - wcoss2 acorn noaacloud             | baseline | cpld_control_nowave_noaero_p8
 
 ### ATM-LND tests ###
 COMPILE | atml | intel | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
diff --git a/tests/tests/atm_ds2s_docn_dice b/tests/tests/atm_ds2s_docn_dice
index 9b5af47162..79d81894cf 100644
--- a/tests/tests/atm_ds2s_docn_dice
+++ b/tests/tests/atm_ds2s_docn_dice
@@ -82,7 +82,12 @@ export CDEPS_INLINE=false
 export ocn_model=docn
 export ice_model=dice
 
-#TODO-task layout
+#task layout
+export INPES=$INPES_cpl_dflt
+export JNPES=$JNPES_cpl_dflt
+export atm_omp_num_threads=$THRD_cpl_dflt
+export WRTTASK_PER_GROUP=$WPG_cpl_dflt
+
 export WAV_tasks=0
 
 #CDEPS settings
@@ -112,5 +117,5 @@ export DIAG_TABLE=diag_table_gfsv16
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export INPUT_NML=global_control.nml.IN
 export MODEL_CONFIGURE=model_configure.IN
-export UFS_CONFIGURE=ufs.configure.s2s.IN
+export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 export FV3_RUN="cpld_control_run.IN cpld_docn_dice.IN"
diff --git a/tests/tests/atm_ds2s_docn_pcice b/tests/tests/atm_ds2s_docn_pcice
index 1e901f75d7..fef8e3cdf3 100644
--- a/tests/tests/atm_ds2s_docn_pcice
+++ b/tests/tests/atm_ds2s_docn_pcice
@@ -82,7 +82,12 @@ export CDEPS_INLINE=false
 export ocn_model=docn
 export ice_model=cice6
 
-#TODO-task layout
+#task layout
+export INPES=$INPES_cpl_dflt
+export JNPES=$JNPES_cpl_dflt
+export atm_omp_num_threads=$THRD_cpl_dflt
+export WRTTASK_PER_GROUP=$WPG_cpl_dflt
+
 export WAV_tasks=0
 
 #CDEPS docn settings
@@ -119,5 +124,5 @@ export DIAG_TABLE=diag_table_gfsv16
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export INPUT_NML=global_control.nml.IN
 export MODEL_CONFIGURE=model_configure.IN
-export UFS_CONFIGURE=ufs.configure.s2s.IN
+export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 export FV3_RUN="cpld_control_run.IN cpld_docn_pcice.IN"
diff --git a/tests/tests/cpld_control_nowave_noaero_p8 b/tests/tests/cpld_control_nowave_noaero_p8
index a809e89cc2..0e33289f10 100644
--- a/tests/tests/cpld_control_nowave_noaero_p8
+++ b/tests/tests/cpld_control_nowave_noaero_p8
@@ -74,6 +74,7 @@ export_cpl
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
+export MED_history_n=1
 
 export INPES=$INPES_cpl_dflt
 export JNPES=$JNPES_cpl_dflt