diff --git a/tests/tests/datm_control_pdlib_s2sw b/tests/tests/datm_control_pdlib_s2sw
new file mode 100644
index 0000000000..2e13214305
--- /dev/null
+++ b/tests/tests/datm_control_pdlib_s2sw
@@ -0,0 +1,67 @@
+#
+#  DATM_CDEPS_MOM6_CICE_CMEPS_GEFS test
+#
+
+export TEST_DESCR="DATM_CDEPS-MOM6-CICE-WW3-CMEPS_GEFS - 1 deg ocean+ice + unstructured 270K WW3 "
+
+export CNTL_DIR=datm_control_pdlib_s2sw
+
+export LIST_FILES=""
+#export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
+#                   RESTART/iced.2011-10-02-00000.nc \
+#                   RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc"
+
+export_datm_cdeps
+export_ww3
+export atm_datamode=GEFS
+
+# atm configure
+export IATM=1536
+export JATM=768
+export ATM_NX_GLB=$IATM
+export ATM_NY_GLB=$JATM
+export ATMRES=${IATM}x${JATM}
+export DATM_SRC=GEFS_NEW
+export FILEBASE_DATM=gefs
+export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+export stream_files="INPUT/${FILEBASE_DATM}.201110.nc"
+export STREAM_OFFSET=-21600
+
+export RESTART_N=12
+export eps_imesh=2.5e-1
+
+export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
+
+# mom6+waves
+export MOM6_USE_LI2016=True
+export MOM6_USE_WAVES=True
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+export WAV_tasks=${WAV_tasks_cpl_unstr}
+
+# waves
+export WW3_OUTDTHR=1
+WW3_DTFLD="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
+export WW3_DTFLD
+WW3_DTPNT="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
+export WW3_DTPNT
+export WW3_DOMAIN=global_270k
+export MESH_WAV=mesh.${WW3_DOMAIN}.nc
+export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN}
+export WW3_CUR='C'
+export WW3_ICE='C'
+export WW3_IC1='F'
+export WW3_IC5='F'
+export WW3_OUTPARS="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA"
+# For default ufs_configure (fast loop), no added fields reqd
+export WW3_RSTFLDS=" "
+# For either history_nc or restart_nc true
+export WW3_PIO_FORMAT='pnetcdf'
+export WW3_PIO_STRIDE=4
+export WW3_PIO_IOTASKS=-99
+export WW3_PIO_REARR='box'
+export WW3_PIO_ROOT=-99
+
+# used only in cpld_datm_cdeps.IN
+export CPLWAV=.true.
+export FV3_RUN=cpld_datm_cdeps.IN
+export UFS_CONFIGURE=ufs.configure.datm_s2sw_fast.IN
\ No newline at end of file
diff --git a/tests/tests/datm_control_s2sw b/tests/tests/datm_control_s2sw
index b141aeb7f8..3941b1e549 100644
--- a/tests/tests/datm_control_s2sw
+++ b/tests/tests/datm_control_s2sw
@@ -2,13 +2,14 @@
 #  DATM_CDEPS_MOM6_CICE_CMEPS_GEFS test
 #
 
-export TEST_DESCR="DATM_CDEPS-MOM6-CICE-WW3-CMEPS_GEFS - 1/4deg ocean+ice + unstructured WW3 "
+export TEST_DESCR="DATM_CDEPS-MOM6-CICE-WW3-CMEPS_GEFS - 1 deg ocean+ice + rectilinear WW3 "
 
 export CNTL_DIR=datm_control_s2sw
 
-export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
-                   RESTART/iced.2011-10-02-00000.nc \
-                   RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc"
+export LIST_FILES=""
+#export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
+#                   RESTART/iced.2011-10-02-00000.nc \
+#                   RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc"
 
 export_datm_cdeps
 export_ww3
@@ -28,21 +29,20 @@ export STREAM_OFFSET=-21600
 
 export RESTART_N=12
 export eps_imesh=2.5e-1
-
 export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
 
 # mom6+waves
 export MOM6_USE_LI2016=True
 export MOM6_USE_WAVES=True
 export MOM6_ALLOW_LANDMASK_CHANGES=True
-
+export WAV_TASKS=${WAV_tasks_cpl_dflt}
 # waves
 export WW3_OUTDTHR=1
 WW3_DTFLD="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
 export WW3_DTFLD
 WW3_DTPNT="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
 export WW3_DTPNT
-export WW3_DOMAIN=global_270k
+export WW3_DOMAIN=glo_1deg
 export MESH_WAV=mesh.${WW3_DOMAIN}.nc
 export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN}
 export WW3_CUR='C'
@@ -50,6 +50,14 @@ export WW3_ICE='C'
 export WW3_IC1='F'
 export WW3_IC5='F'
 export WW3_OUTPARS="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA"
+# For default ufs_configure (fast loop), no added fields reqd
+export WW3_RSTFLDS=" "
+# For either history_nc or restart_nc true
+export WW3_PIO_FORMAT='pnetcdf'
+export WW3_PIO_STRIDE=4
+export WW3_PIO_IOTASKS=-99
+export WW3_PIO_REARR='box'
+export WW3_PIO_ROOT=-99
 
 # used only in cpld_datm_cdeps.IN
 export CPLWAV=.true.