diff --git a/FV3 b/FV3
index 7a26618032..17aa5907ff 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 7a2661803237ed8f5f7534eba291c8d62a341fef
+Subproject commit 17aa5907ff7cb8fc1d3bb6278f67e84cf80dac21
diff --git a/tests/lowres_rt.conf b/tests/lowres_rt.conf
index 7e98366d5b..473457808b 100644
--- a/tests/lowres_rt.conf
+++ b/tests/lowres_rt.conf
@@ -1,2 +1,2 @@
-COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_coupled_lowres -DCMAKE_BUILD_TYPE==Debug -DHYDRO=ON|   | fv3 |
+COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_coupled_lowres -DDEBUG=ON -DHYDRO=ON|   | fv3 |
 RUN | cpld_control_c12                                  |                                      | baseline |
diff --git a/tests/tests/cpld_control_c12 b/tests/tests/cpld_control_c12
index b981ceb0ed..6c6743a831 100644
--- a/tests/tests/cpld_control_c12
+++ b/tests/tests/cpld_control_c12
@@ -55,11 +55,12 @@ export LIST_FILES=" "
 #                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
 export ATMRES=C12
 
-export_fv3_v16
+#export_fv3_v16
+export_fv3
 export_cpl
 export CCPP_SUITE=FV3_coupled_lowres
 
-export ATMRES=C12
+#export ATMRES=C12
 
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
@@ -72,16 +73,18 @@ export TAU=10.
 export N_SPONGE=5
 export D2_BG_K2=0.0
 export N_SPLIT=6
-export DNATS=1
+#export DNATS=1
 export MAKE_NH=.false.
 export HYDROSTATIC=.true.
 export GWD_OPT=0
 export DO_UGWP_V1=.false.
+export DO_UGWP_V0=.false.
+export DO_GSL_DRAG_SS=.false.
 export atm_omp_num_threads=1
 export WRTTASK_PER_GROUP=2
 export LSM=1
-export ISATMEDMF=1
-export IMP_PHYSICS=11
+#export ISATMEDMF=1
+#export IMP_PHYSICS=11
 # export INPES=$INPES_cpl_c48
 # export JNPES=$JNPES_cpl_c48
 # export atm_omp_num_threads=$THRD_cpl_c48
@@ -164,7 +167,7 @@ export MOM6_USE_WAVES=False
 export eps_imesh=1.0e0
 
 export DIAG_TABLE=diag_table_template
-export FIELD_TABLE=field_table_thompson_noaero_tke
+#export FIELD_TABLE=field_table_gfsv16
 export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN