diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
index 8033547de0..cfea051669 160000
--- a/CMEPS-interface/CMEPS
+++ b/CMEPS-interface/CMEPS
@@ -1 +1 @@
-Subproject commit 8033547de0a663ae2a6cf74bb16e03c4a097affb
+Subproject commit cfea05166973d225f16942bd9b77d9a9f72dd706
diff --git a/tests/parm/ufs.configure.s2s.IN b/tests/parm/ufs.configure.s2s.IN
index 9ff939a6c7..97875e75fb 100644
--- a/tests/parm/ufs.configure.s2s.IN
+++ b/tests/parm/ufs.configure.s2s.IN
@@ -93,6 +93,14 @@ MED_attributes::
       coupling_mode = @[CPLMODE]
       pio_rearranger = @[pio_rearranger]
       ocean_albedo_limit = @[ocean_albedo_limit]
+      test_interp = @[TESTMAP]
+      dststatus_print = true
+      history_n_atm_inst = 1
+      history_option_atm_inst = nsteps
+      history_n_ice_inst = 1
+      history_option_ice_inst = nsteps
+      history_n_ocn_inst = 1
+      history_option_ocn_inst = nsteps
 ::
 
 ALLCOMP_attributes::
@@ -108,7 +116,7 @@ ALLCOMP_attributes::
       restart_option = nhours
       restart_ymd = -999
       write_restart_at_endofrun = @[WRITE_ENDOFRUN_RESTART]
-      dbug_flag = @[cap_dbug_flag]
+      dbug_flag = 6
       stop_n = @[FHMAX]
       stop_option = nhours
       stop_ymd = -999
diff --git a/tests/parm/ufs.configure.s2swa_fast_esmf.IN b/tests/parm/ufs.configure.s2swa_fast_esmf.IN
index b9dc275461..e77f9266bc 100644
--- a/tests/parm/ufs.configure.s2swa_fast_esmf.IN
+++ b/tests/parm/ufs.configure.s2swa_fast_esmf.IN
@@ -124,16 +124,8 @@ MED_attributes::
       OCN_model = @[ocn_model]
       WAV_model = @[wav_model]
       coupling_mode = @[CPLMODE]
-      test_interp = @[TESTMAP]
-      dststatus_print = true
       pio_rearranger = @[pio_rearranger]
       ocean_albedo_limit = @[ocean_albedo_limit]
-      history_n_atm_inst = 1
-      history_option_atm_inst = nsteps
-      history_n_ice_inst = 1
-      history_option_ice_inst = nsteps
-      history_n_ocn_inst = 1
-      history_option_ocn_inst = nsteps
 ::
 
 ALLCOMP_attributes::
diff --git a/tests/tests/cpld_control_bilin b/tests/tests/cpld_control_bilin
index a29a12864b..102ec39f16 100644
--- a/tests/tests/cpld_control_bilin
+++ b/tests/tests/cpld_control_bilin
@@ -105,8 +105,7 @@ export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export DIAG_TABLE=diag_table_template
-export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
-
+export UFS_CONFIGURE=ufs.configure.s2s.IN
 export FV3_RUN=cpld_control_run.IN
 
 export K_SPLIT=2
diff --git a/tests/tests/cpld_control_mapconsf b/tests/tests/cpld_control_mapconsf
index fcfefdf9cf..a59ab22dff 100644
--- a/tests/tests/cpld_control_mapconsf
+++ b/tests/tests/cpld_control_mapconsf
@@ -105,7 +105,7 @@ export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export DIAG_TABLE=diag_table_template
-export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
+export UFS_CONFIGURE=ufs.configure.s2s.IN
 
 export FV3_RUN=cpld_control_run.IN