diff --git a/tests/tests/control_c192 b/tests/tests/control_c192
index d72b2f7289..8ba14ae125 100644
--- a/tests/tests/control_c192
+++ b/tests/tests/control_c192
@@ -30,13 +30,11 @@ export NPZ=127
 export NPZP=128
 export NPX=193
 export NPY=193
-#export DT_ATMOS=360
 export SYEAR=2021
 export SMONTH=03
 export SDAY=22
 export SHOUR=06
 export RESTART_INTERVAL=48
-#export CDMBWD=${CDMBWD_c192}
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
@@ -46,5 +44,4 @@ export IMO=768
 export JMO=384
 
 export FV3_RUN=control_run.IN
-#export CCPP_SUITE=FV3_GFS_v17_p8
 export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_c384 b/tests/tests/control_c384
index 2561107384..9619b89e3e 100644
--- a/tests/tests/control_c384
+++ b/tests/tests/control_c384
@@ -38,9 +38,7 @@ export SYEAR=2021
 export SMONTH=03
 export SDAY=22
 export SHOUR=06
-#export DT_ATMOS=225
 export RESTART_INTERVAL=0
-#export CDMBWD=${CDMBWD_c384}
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.
@@ -51,7 +49,6 @@ export JMO=768
 export OUTPUT_FH="6 -1"
 
 export FV3_RUN=control_run.IN
-#export CCPP_SUITE=FV3_GFS_v17_p8
 export INPUT_NML=global_control.nml.IN
 
 if [[ $MACHINE_ID = jet ]]; then 
diff --git a/tests/tests/control_c48 b/tests/tests/control_c48
index 940fbe44ee..a68ace8606 100644
--- a/tests/tests/control_c48
+++ b/tests/tests/control_c48
@@ -45,10 +45,14 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile5.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
+export ATMRES=C48
+
 export_fv3
 export_tiled
-export_ugwpv1
-export CCPP_SUITE=FV3_GFS_v17_p8_ugwpv1
+if [[ $MACHINE_ID != hera ]] || [[ $RT_COMPILER != gnu ]]; then
+  export_ugwpv1
+  export CCPP_SUITE=FV3_GFS_v17_p8_ugwpv1
+fi
 
 export INPES=1
 export JNPES=1
diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17
index 78d495a848..1f64f8b861 100644
--- a/tests/tests/cpld_debug_gfsv17
+++ b/tests/tests/cpld_debug_gfsv17
@@ -103,6 +103,8 @@ export UFS_CONFIGURE=ufs.configure.s2sw.IN
 
 export FV3_RUN=cpld_control_run.IN
 
+export DT_INNER=360
+export DT_ATMOS=360
 export K_SPLIT=2
 export N_SPLIT=5