diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 01cea4699e..8d778748af 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -70,7 +70,7 @@
   export OCN_thrds_cpl_bmrk=1
   export ICE_tasks_cpl_bmrk=48
   export ICE_thrds_cpl_bmrk=1
-  export WAV_tasks_cpl_bmrk=80
+  export WAV_tasks_cpl_bmrk=120
   export WAV_thrds_cpl_bmrk=2
 
   export THRD_cpl_c192=2
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
index ce9b016446..0900f03b32 100644
--- a/tests/fv3_conf/cpld_control_run.IN
+++ b/tests/fv3_conf/cpld_control_run.IN
@@ -18,8 +18,8 @@ ICERES=${OCNRES:0:1}.${OCNRES:1}
 V2_SFC_FILE=${V2_SFC_FILE:-false}
 
 if [[ ${BMIC} == .true. ]]; then
-  #FV3_IC=@[INPUTDATA_ROOT]/GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/ #TODO: testing
-  FV3_IC=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/
+  #FV3_IC=@[INPUTDATA_ROOT]/GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/ #TODO: use once input data is staged
+  FV3_IC=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/RT_GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/
   MOM_IC=${FV3_IC}; ICE_IC=${FV3_IC}; WAV_IC=${FV3_IC}
 else
   if [[ $ATMRES == C48 ]]; then
@@ -204,7 +204,7 @@ fi
 #prognostic aerosols
 if [ $CPLCHM = .true. ]; then
   if [[ ${BMIC} == .true. ]]; then
-    ln -sf /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/ExtData .
+    ln -sf ${FV3_IC}/../ExtData .
   else
     ln -sf  @[INPUTDATA_ROOT]/GOCART/p8c_5d/ExtData .
   fi
diff --git a/tests/rt.conf b/tests/rt.conf
index f5853637f2..02e333e5e9 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -54,12 +54,12 @@ RUN | cpld_restart_c192_p8                              | - wcoss2 jet acorn s4
 COMPILE | s2swa | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
 RUN | cpld_control_gefs                                 | - noaacloud                          | baseline |
 RUN | cpld_restart_gefs                                 | - noaacloud                          |          | cpld_control_gefs
-RUN | cpld_dcp_gefs                                     | - noaacloud                          | baseline |
+RUN | cpld_dcp_gefs                                     | - noaacloud                          |          |
 
 COMPILE | s2swa_debug | intel | -DAPP=S2SWA -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
 RUN | cpld_debug_gefs                                   | - noaacloud                          | baseline |
-COMPILE | s2swa_debug | gnu   | -DAPP=S2SWA -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
-RUN | cpld_debug_gefs                                   | - noaacloud                          | baseline |
+#COMPILE | s2swa_debug | gnu   | -DAPP=S2SWA -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
+#RUN | cpld_debug_gefs                                   | - noaacloud                          | baseline |
 
 # Aerosol, no Wave
 RUN | cpld_s2sa_p8                                      | - noaacloud                          | baseline |
diff --git a/tests/rt.sh b/tests/rt.sh
index 83909150a1..7ca3a761ca 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -1019,7 +1019,8 @@ fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20240501}
 #INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20240214
-INPUTDATA_ROOT_WW3=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/WW3_input_data
+#TODO: add glo_025 files to WW3 input data
+INPUTDATA_ROOT_WW3=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/RT_GEFS/WW3
 INPUTDATA_LM4=${INPUTDATA_LM4:-${INPUTDATA_ROOT}/LM4_input_data}
 
 shift $((OPTIND-1))
diff --git a/tests/tests/cpld_control_gefs b/tests/tests/cpld_control_gefs
index cb1c7b9a75..ac02642cee 100644
--- a/tests/tests/cpld_control_gefs
+++ b/tests/tests/cpld_control_gefs
@@ -74,7 +74,6 @@ export FHZERO=3
 
 export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
 export WRTTASK_PER_GROUP=$(( WPG_cpl_bmrk * THRD_cpl_bmrk ))
 export WRITE_DOPOST=.true.
 
diff --git a/tests/tests/cpld_debug_gefs b/tests/tests/cpld_debug_gefs
index 11f186ee74..49484c6254 100644
--- a/tests/tests/cpld_debug_gefs
+++ b/tests/tests/cpld_debug_gefs
@@ -57,3 +57,5 @@ export DAYS=0.125
 export FHMAX=3
 export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 export MOM6_OUTPUT_FH=3
+
+export WLCLK=60