diff --git a/WW3 b/WW3
index 0a6f4d28f8..dd29dd885e 160000
--- a/WW3
+++ b/WW3
@@ -1 +1 @@
-Subproject commit 0a6f4d28f816aee292d3a7ec0e344f2db54d63a3
+Subproject commit dd29dd885ecbe0453dfa365da9f918600a9b0c30
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 505abeb7f7..b92fb0c690 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -602,7 +602,7 @@ export WINDLINE='$'
 export CURRLINE='$'
 export NFGRIDS=0
 export NMGRIDS=1
-export ww3gline="'glo_30m'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'glo_30m'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
 
 # Regional
 export WRITE_RESTART_WITH_BCS=.false.
@@ -661,7 +661,7 @@ export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
 export RESTART_N=${FHMAX}
-export CPLMODE='nems_orig'
+export CPLMODE='nems_frac'
 export cap_dbug_flag="0"
 export use_coldstart="false"
 export use_mommesh="true"
@@ -672,7 +672,7 @@ export RUNTYPE='startup'
 # set frac_grid=.F. but FRAC_GRID_INPUT=.T.
 # to repro existing tests set both frac_grid and FRAC_GRID_INPUT to .F.
 # to run frac_grid, set both frac_grid and FRAC_GRID_INPUTs to .T.
-export FRAC_GRID='.F.'
+export FRAC_GRID='.T.'
 export FRAC_GRID_INPUT='.T.'
 export CCPP_SUITE="FV3_GFS_2017_coupled"
 export INPUT_NML=input.mom6_ccpp.nml.IN
@@ -736,9 +736,12 @@ export RESTART_EXT='.false.'
 export FRAZIL_FWSALT='.true.'
 # default to write CICE average history files
 export CICE_HIST_AVG='.true.'
+# default non-mushy thermo
+export KTHERM=1
+export TFREEZE_OPTION='linear_salt'
 
 #wave
-export ww3gline="'glo_1deg'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'glo_1deg'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
 export WW3OUTPUTTYPE=' 1'
 
 # checkpoint restarts
@@ -855,6 +858,9 @@ export RESTART_EXT='.false.'
 export FRAZIL_FWSALT='.true.'
 # default to write CICE average history files
 export CICE_HIST_AVG='.true.'
+# default non-mushy thermo
+export KTHERM=1
+export TFREEZE_OPTION='linear_salt'
 export BL_SUFFIX=""
 export RT_SUFFIX=""
 }
@@ -967,6 +973,9 @@ export RESTART_EXT='.false.'
 export FRAZIL_FWSALT='.true.'
 # default to write CICE average history files
 export CICE_HIST_AVG='.true.'
+# default non-mushy thermo
+export KTHERM=1
+export TFREEZE_OPTION='linear_salt'
 export BL_SUFFIX=""
 export RT_SUFFIX=""
 }
diff --git a/tests/edit_inputs.sh b/tests/edit_inputs.sh
index 49ebd66c31..beb3926ad4 100755
--- a/tests/edit_inputs.sh
+++ b/tests/edit_inputs.sh
@@ -26,7 +26,9 @@ function edit_ice_in {
       -e "s/USE_RESTART_TIME/$USE_RESTART_TIME/g" \
       -e "s/DUMPFREQ_N/$DUMPFREQ_N/g" \
       -e "s/DUMPFREQ/$DUMPFREQ/g" \
-      -e "s/FRAZIL_FWSALT/$FRAZIL_FWSALT/g"
+      -e "s/FRAZIL_FWSALT/$FRAZIL_FWSALT/g" \
+      -e "s/TFREEZE_OPTION/$TFREEZE_OPTION/g" \
+      -e "s/KTHERM/$KTHERM/g"
 }
 
 function edit_mom_input {
diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
index 3204462541..1ec3c70956 100644
--- a/tests/parm/ice_in_template
+++ b/tests/parm/ice_in_template
@@ -79,7 +79,7 @@
 
 &thermo_nml
     kitd              = 1
-    ktherm            = 1
+    ktherm            = KTHERM
     conduct           = 'MU71'
     a_rapid_mode      =  0.5e-3
     Rac_rapid_mode    =    10.0
@@ -150,7 +150,7 @@
     fbot_xfer_type  = 'constant'
     update_ocn_f    = FRAZIL_FWSALT
     l_mpond_fresh   = .false.
-    tfrz_option     = 'linear_salt'
+    tfrz_option     = 'TFREEZE_OPTION'
     restart_coszen  = .true.
 /
 
diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN
deleted file mode 100644
index 95073e3bc6..0000000000
--- a/tests/parm/input.benchmark_ccpp.nml.IN
+++ /dev/null
@@ -1,320 +0,0 @@
-&atmos_model_nml
-  blocksize = 32
-  chksum_debug = .false.
-  dycore_only = .false.
-  fdiag = @[FDIAG]
-  fhmax = @[FHMAX]
-  fhout = @[NFHOUT]
-  fhmaxhf = @[NFHMAX_HF]
-  fhouthf = @[NFHOUT_HF]
-  ccpp_suite = '@[CCPP_SUITE]'
-  
-/
-
-&diag_manager_nml
-  prepend_date = .false.
-  
-/
-
-&fms_io_nml
-  checksum_required = .false.
-  max_files_r = 100
-  max_files_w = 100
-  
-/
-
-&fms_nml
-  clock_grain = 'ROUTINE'
-  domains_stack_size = 3000000
-  print_memory_usage = .false.
-  
-/
-
-&fv_core_nml
-  layout   = @[INPES],@[JNPES]
-  io_layout = 1,1
-  npx      = @[NPX]
-  npy      = @[NPY]
-  ntiles   = 6,
-  npz    = @[NPZ]
-  dz_min = @[DZ_MIN]
-  grid_type = -1
-  make_nh = @[MAKE_NH]
-  fv_debug = .false.
-  range_warn = .false.
-  reset_eta = .false.
-  n_sponge = 10
-  nudge_qv = .true.
-  nudge_dz = .false.
-  tau = 10.
-  rf_cutoff = 7.5e2
-  d2_bg_k1 = 0.15
-  d2_bg_k2 = 0.02
-  kord_tm = -9
-  kord_mt = 9
-  kord_wz = 9
-  kord_tr = 9
-  hydrostatic = .false.
-  phys_hydrostatic = .false.
-  use_hydro_pressure = .false.
-  beta = 0.
-  a_imp = 1.
-  p_fac = 0.1
-  k_split = 2
-  n_split = 6
-  nwat = 6
-  na_init = @[NA_INIT]
-  d_ext = 0.
-  dnats = 1
-  fv_sg_adj = 450
-  d2_bg = 0.
-  nord = 2
-  dddmp = 0.1
-  d4_bg = 0.12
-  vtdm4 = 0.02
-  delt_max = 0.002
-  ke_bg = 0.
-  do_vort_damp = .true.
-  external_ic = @[EXTERNAL_IC]
-  external_eta = .true.
-  gfs_phil = .false.
-  nggps_ic = @[NGGPS_IC]
-  mountain = @[MOUNTAIN]
-  ncep_ic = .false.
-  d_con = 1.
-  hord_mt = 5
-  hord_vt = 5
-  hord_tm = 5
-  hord_dp = -5
-  hord_tr = 8
-  adjust_dry_mass = .false.
-  consv_te = 1.
-  do_sat_adj = .true.
-  consv_am = .false.
-  fill = .true.
-  dwind_2d = .false.
-  print_freq = 6
-  warm_start = @[WARM_START]
-  no_dycore = .false.
-  z_tracer = .true.
-  agrid_vel_rst = .true.
-  read_increment = .false.
-  res_latlon_dynamics = ""
-  
-/
-
-&cires_ugwp_nml
-       knob_ugwp_solver  = 2
-       knob_ugwp_source  = 1,1,0,0
-       knob_ugwp_wvspec  = 1,25,25,25
-       knob_ugwp_azdir   = 2,4,4,4
-       knob_ugwp_stoch   = 0,0,0,0
-       knob_ugwp_effac   = 1,1,1,1
-       knob_ugwp_doaxyz  = 1
-       knob_ugwp_doheat  = 1
-       knob_ugwp_dokdis  = 1
-       knob_ugwp_ndx4lh  = 1
-       knob_ugwp_version = 0
-       launch_level      = 27
-/
-
-&external_ic_nml
-  filtered_terrain = .true.
-  levp = 65
-  gfs_dwinds = .true.
-  checker_tr = .false.
-  nt_checker = 0
-  
-/
-
-&gfs_physics_nml
-  fhzero       = 6
-  oz_phys      = .false.
-  oz_phys_2015 = .true.
-  h2o_phys     = .true.
-  ldiag3d      = .false.
-  fhcyc        = 24
-  use_ufo      = .true.
-  pre_rad      = .false.
-  ncld         = 5
-  imp_physics  = 11
-  pdfcld       = .false.
-  fhswr        = 3600.
-  fhlwr        = 3600.
-  ialb         = 1
-  iems         = 1
-  iaer         = 111
-  icliq_sw     = 1
-  iovr         = 1
-  ico2         = 2
-  isubc_sw     = 2
-  isubc_lw     = 2
-  isol         = 2
-  lwhtr        = .true.
-  swhtr        = .true.
-  cnvgwd       = .true.
-  shal_cnv     = .true.
-  cal_pre      = .false.
-  redrag       = .true.
-  dspheat      = .true.
-  hybedmf      = .true.
-  satmedmf     = .false.
-  isatmedmf    = 0
-  lheatstrg    = .false.
-  random_clds  = .false.
-  trans_trac   = .true.
-  cnvcld       = .true.
-  imfshalcnv   = 2
-  imfdeepcnv   = 2
-  cdmbgwd      = @[CDMBWD]
-  prslrd0      = 0.
-  ivegsrc      = 1
-  isot         = 1
-  lsoil        = 4
-  lsm          = 1
-  iopt_dveg    = 1
-  iopt_crs     = 1
-  iopt_btr     = 1
-  iopt_run     = 1
-  iopt_sfc     = 1
-  iopt_frz     = 1
-  iopt_inf     = 1
-  iopt_rad     = 1
-  iopt_alb     = 2
-  iopt_snf     = 4
-  iopt_tbot    = 2
-  iopt_stc     = 1
-  debug        = .false.
-  nstf_name    = 0,0,0,0,0
-  frac_grid    = @[FRAC_GRID]
-  nst_anl      = .false.
-  psautco      = 0.0008,0.0005
-  prautco      = 0.00015,0.00015
-  lgfdlmprad   = .true.
-  effr_in      = .true.
-  ldiag_ugwp   = .false.
-  do_ugwp      = .false.
-  do_tofd      = .false.
-  cplflx       = .T.
-  cplwav         = @[CPLWAV]
-  cplwav2atm     = @[CPLWAV2ATM]
-  min_seaice     = @[MIN_SEAICE]
-/
-
-&gfdl_cloud_microphysics_nml
-  sedi_transport = .true.
-  do_sedi_heat = .false.
-  rad_snow = .true.
-  rad_graupel = .true.
-  rad_rain = .true.
-  const_vi = .F.
-  const_vs = .F.
-  const_vg = .F.
-  const_vr = .F.
-  vi_max = 1.
-  vs_max = 2.
-  vg_max = 12.
-  vr_max = 12.
-  qi_lim = 1.
-  prog_ccn = .false.
-  do_qa = .true.
-  fast_sat_adj = .true.
-  tau_l2v = 225.
-  tau_v2l = 150.
-  tau_g2v = 900.
-  rthresh = 10.e-6  ! This is a key parameter for cloud water
-  dw_land  = 0.16
-  dw_ocean = 0.10
-  ql_gen = 1.0e-3
-  ql_mlt = 1.0e-3
-  qi0_crt = 8.0E-5
-  qs0_crt = 1.0e-3
-  tau_i2s = 1000.
-  c_psaci = 0.05
-  c_pgacs = 0.01
-  rh_inc = 0.30
-  rh_inr = 0.30
-  rh_ins = 0.30
-  ccn_l = 300.
-  ccn_o = 100.
-  c_paut = 0.5
-  c_cracw = 0.8
-  use_ppm = .false.
-  use_ccn = .true.
-  mono_prof = .true.
-  z_slope_liq  = .true.
-  z_slope_ice  = .true.
-  de_ice = .false.
-  fix_negative = .true.
-  icloud_f = 1
-  mp_time = 150.
-  
-/
-
-&interpolator_nml
-  interp_method = 'conserve_great_circle'
-  
-/
-
-&namsfc
-       FNGLAC   = "global_glacier.2x2.grb",
-       FNMXIC   = "global_maxice.2x2.grb",
-       FNTSFC   = "RTGSST.1982.2012.monthly.clim.grb",
-       FNSNOC   = "global_snoclim.1.875.grb",
-       FNZORC   = "igbp",
-       FNALBC   = @[FNALBC]
-       FNALBC2  = "global_albedo4.1x1.grb",
-       FNAISC   = "CFSR.SEAICE.1982.2012.monthly.clim.grb",
-       FNTG3C   = "global_tg3clim.2.6x1.5.grb",
-       FNVEGC   = "global_vegfrac.0.144.decpercent.grb",
-       FNVETC   = @[FNVETC]
-       FNSOTC   = @[FNSOTC]
-       FNSMCC   = @[FNSMCC]
-       FNMSKH   = "global_slmask.t1534.3072.1536.grb",
-       FNTSFA   = "",
-       FNACNA   = "",
-       FNSNOA   = "",
-       FNVMNC   = "global_shdmin.0.144x0.144.grb",
-       FNVMXC   = "global_shdmax.0.144x0.144.grb",
-       FNSLPC   = "global_slope.1x1.grb",
-       FNABSC   = @[FNABSC]
-       LDEBUG   =.false.,
-  FSMCL(2) = 99999
-  FSMCL(3) = 99999
-  FSMCL(4) = 99999
-  LANDICE = .true.
-  FTSFS = 90
-  FAISL = 99999
-  FAISS = 99999
-  FSNOL = 99999
-  FSNOS = 99999
-  FSICL = 99999
-  FSICS = 99999
-  FTSFL = 99999
-  FVETL = 99999
-  FSOTL = 99999
-  FvmnL = 99999
-  FvmxL = 99999
-  FSLPL = 99999
-  FABSL = 99999
-  
-/
-
-&fv_grid_nml
-  grid_file = 'INPUT/grid_spec.nc'
-  
-/
-
-&nam_stochy
-/
-&nam_sfcperts
-/
-
- &MOM_input_nml
-         output_directory = 'MOM6_OUTPUT/',
-         input_filename = '@[MOM6_RESTART_SETTING]'
-         restart_input_dir = 'INPUT/',
-         restart_output_dir = 'RESTART/',
-         parameter_filename = 'INPUT/MOM_input',
-                              'INPUT/MOM_override' /
-
diff --git a/tests/rt.conf b/tests/rt.conf
index 30ba70b42a..fe63b71baf 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -2,48 +2,33 @@
 # CPLD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled,FV3_GFS_v16_couplednsst             | - wcoss_cray                  | fv3 |
+COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled,FV3_GFS_v16_couplednsst                   | - wcoss_cray                            | fv3 |
 RUN     | cpld_control                                                                                                            | - wcoss_cray                            | fv3 |
 RUN     | cpld_restart                                                                                                            | - wcoss_cray                            |     | cpld_control
-RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray                            | fv3 |
-RUN     | cpld_restartfrac                                                                                                        | - wcoss_cray                            |     | cpld_controlfrac
-
-RUN     | cpld_2threads                                                                                                           | - wcoss_cray                            |     |
+#RUN     | cpld_2threads                                                                                                           | - wcoss_cray                            |     |
 RUN     | cpld_decomp                                                                                                             | - wcoss_cray jet.intel                  |     |
 RUN     | cpld_ca                                                                                                                 | - wcoss_cray                            | fv3 |
 
 #12h/36h/48h restart tests
 RUN     | cpld_control_c192                                                                                                       | - wcoss_cray                            | fv3 |
 RUN     | cpld_restart_c192                                                                                                       | - wcoss_cray                            |     | cpld_control_c192
-RUN     | cpld_controlfrac_c192                                                                                                   | - wcoss_cray                            | fv3 |
-RUN     | cpld_restartfrac_c192                                                                                                   | - wcoss_cray                            |     | cpld_controlfrac_c192
 
 RUN     | cpld_control_c384                                                                                                       | - wcoss_cray                            | fv3 |
 RUN     | cpld_restart_c384                                                                                                       | - wcoss_cray                            |     | cpld_control_c384
-RUN     | cpld_controlfrac_c384                                                                                                   | - wcoss_cray                            | fv3 |
-RUN     | cpld_restartfrac_c384                                                                                                   | - wcoss_cray                            |     | cpld_controlfrac_c384
-
-RUN     | cpld_bmark                                                                                                              | - wcoss_cray                            | fv3 |
-RUN     | cpld_restart_bmark                                                                                                      | - wcoss_cray                            |     | cpld_bmark
-RUN     | cpld_bmarkfrac                                                                                                          | - wcoss_cray                            | fv3 |
-RUN     | cpld_restart_bmarkfrac                                                                                                  | - wcoss_cray                            |     | cpld_bmarkfrac
 
 #3h/3h/6h restart test
 # test fails on gaea with esmfpio error for tiled output
-RUN     | cpld_bmarkfrac_v16                                                                                                      | - wcoss_cray                            | fv3 |
-RUN     | cpld_bmarkfrac_v16_nsst                                                                                                 | - wcoss_cray                            | fv3 |
-RUN     | cpld_restart_bmarkfrac_v16                                                                                              | - wcoss_cray                            |     | cpld_bmarkfrac_v16
-
-COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp               | - wcoss_cray                  | fv3 |
-RUN     | cpld_bmark_wave                                                                                                         | - wcoss_cray                            | fv3 |
-RUN     | cpld_bmarkfrac_wave                                                                                                     | - wcoss_cray                            | fv3 |
-RUN     | cpld_bmarkfrac_wave_v16                                                                                                 | - wcoss_cray                            | fv3 |
-RUN     | cpld_bmarkfrac_wave_v16_noahmp                                                                                          | - wcoss_cray                            | fv3 |
+RUN     | cpld_bmark_v16                                                                                                          | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_bmark_v16                                                                                                  | - wcoss_cray                            |     | cpld_bmark_v16
+RUN     | cpld_bmark_v16_nsst                                                                                                     | - wcoss_cray                            | fv3 |
+
+COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                           | - wcoss_cray                            | fv3 |
+RUN     | cpld_bmark_wave_v16                                                                                                     | - wcoss_cray                            | fv3 |
+RUN     | cpld_bmark_wave_v16_noahmp                                                                                              | - wcoss_cray                            | fv3 |
 RUN     | cpld_control_wave                                                                                                       | - wcoss_cray                            | fv3 |
 
 COMPILE | APP=S2S DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled     | - wcoss_cray                            | fv3 |
 RUN     | cpld_debug                                                                                                              | - wcoss_cray                            | fv3 |
-RUN     | cpld_debugfrac                                                                                                          | - wcoss_cray                            | fv3 |
 
 ###################################################################################################################################################################################
 # PROD tests                                                                                                                                                                      #
diff --git a/tests/rt.sh b/tests/rt.sh
index 73f21fd313..a9a2328129 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210603
+BL_DATE=20210607
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
diff --git a/tests/rt_35d.conf b/tests/rt_35d.conf
index 685998a3d4..6c0372e479 100644
--- a/tests/rt_35d.conf
+++ b/tests/rt_35d.conf
@@ -2,22 +2,22 @@
 # CPLD Benchmark 35d tests                                                                                                                                                        #
 ###############################################################################################################################################################################
 
-COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                       | + hera.intel orion.intel | fv3 |  |
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012010100
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012040100
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012070100
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012100100
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2013010100
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2013040100
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2013070100
-#RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2013100100
+#COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                   | + hera.intel orion.intel | fv3 |  |
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2012010100
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2012040100
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2012070100
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2012100100
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2013010100
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2013040100
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2013070100
+#RUN     | cpld_bmark_wave_v16_35d                                                                                         |                          | fv3 |  | 2013100100
 
-COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                       | + hera.intel orion.intel +gaea.intel | fv3 |  |
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012010100
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012040100
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012070100
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012100100
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013010100
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013040100
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013070100
-RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013100100
+COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                   | + hera.intel orion.intel gaea.intel  | fv3 |  |
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012010100
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012040100
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012070100
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012100100
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013010100
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013040100
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013070100
+RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013100100
diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
index 345819d935..994cb56792 100644
--- a/tests/rt_gnu.conf
+++ b/tests/rt_gnu.conf
@@ -59,10 +59,10 @@ RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug
 ##################################################################################################################################################################
 
 COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled                                 |                | fv3         |
-RUN     | cpld_controlfrac                                                                                                        |                | fv3         |
+RUN     | cpld_control                                                                                                            |                | fv3         |
 
 COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled DEBUG=Y                         |                | fv3         |
-RUN     | cpld_debugfrac                                                                                                          |                | fv3         |
+RUN     | cpld_debug                                                                                                              |                | fv3         |
 
 ##################################################################################################################################################################
 # Data Atmosphere tests                                                                                                                                          #
diff --git a/tests/tests/cpld_bmark b/tests/tests/cpld_bmark
deleted file mode 100644
index d48d8aef78..0000000000
--- a/tests/tests/cpld_bmark
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-#  cpld_bmark test
-#
-
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 - Benchmark test"
-
-export CNTL_DIR="cpld_bmark"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
-
-export_fv3
-export_cpl
-
-export RESTART_INTERVAL="12"
-export RESTART_N=${RESTART_INTERVAL}
-
-export SYEAR="2013"
-export SMONTH="04"
-export SDAY="01"
-export SHOUR="00"
-
-export TASKS=$TASKS_cpl_bmrk
-export TPN=$TPN_cpl_bmrk
-export INPES=$INPES_cpl_bmrk
-export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
-
-export med_petlist_bounds=$MPB_cpl_bmrk
-export atm_petlist_bounds=$APB_cpl_bmrk
-export ocn_petlist_bounds=$OPB_cpl_bmrk
-export ice_petlist_bounds=$IPB_cpl_bmrk
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_bmark_35d b/tests/tests/cpld_bmark_35d
deleted file mode 100644
index 7e941ffb13..0000000000
--- a/tests/tests/cpld_bmark_35d
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-#  cpld_bmark 35D
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 - Benchmark 35d test"
-
-export_35d_run
-export_fv3
-export_cpl
-
-export SYEAR
-export SMONTH
-export SDAY="01"
-export SHOUR="00"
-
-export DAYS="35"
-export FHMAX="840"
-export RESTART_N=${FHMAX}
-export WLCLK=480
-
-export TASKS=$TASKS_cpl_bmrk
-export TPN=$TPN_cpl_bmrk
-export INPES=$INPES_cpl_bmrk
-export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
-
-export med_petlist_bounds=$MPB_cpl_bmrk
-export atm_petlist_bounds=$APB_cpl_bmrk
-export ocn_petlist_bounds=$OPB_cpl_bmrk
-export ice_petlist_bounds=$IPB_cpl_bmrk
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export RT35D='.T.'
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_bmarkfrac_v16 b/tests/tests/cpld_bmark_v16
similarity index 96%
rename from tests/tests/cpld_bmarkfrac_v16
rename to tests/tests/cpld_bmark_v16
index 5002c8fb5d..33010a1f0d 100644
--- a/tests/tests/cpld_bmarkfrac_v16
+++ b/tests/tests/cpld_bmark_v16
@@ -1,10 +1,10 @@
 #
-#  cpld_bmarkfrac_v16 test
+#  cpld_bmark_v16 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - Benchmark test - frac grid - v16"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - Benchmark test - v16"
 
-export CNTL_DIR="cpld_bmarkfrac_v16"
+export CNTL_DIR="cpld_bmark_v16"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
@@ -104,9 +104,6 @@ export CPL_FAST=${DT_ATMOS}
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
diff --git a/tests/tests/cpld_bmarkfrac_v16_35d b/tests/tests/cpld_bmark_v16_35d
similarity index 98%
rename from tests/tests/cpld_bmarkfrac_v16_35d
rename to tests/tests/cpld_bmark_v16_35d
index 384b13efe2..681c897ac6 100644
--- a/tests/tests/cpld_bmarkfrac_v16_35d
+++ b/tests/tests/cpld_bmark_v16_35d
@@ -58,9 +58,6 @@ export CPL_FAST=${DT_ATMOS}
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
diff --git a/tests/tests/cpld_bmarkfrac_v16_nsst b/tests/tests/cpld_bmark_v16_nsst
similarity index 96%
rename from tests/tests/cpld_bmarkfrac_v16_nsst
rename to tests/tests/cpld_bmark_v16_nsst
index 9f86f0967f..265c5560a8 100644
--- a/tests/tests/cpld_bmarkfrac_v16_nsst
+++ b/tests/tests/cpld_bmark_v16_nsst
@@ -1,10 +1,10 @@
 #
-#  cpld_bmarkfrac_v16_nsst test
+#  cpld_bmark_v16_nsst test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - Benchmark test - frac grid - v16"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - Benchmark test - v16"
 
-export CNTL_DIR="cpld_bmarkfrac_v16_nsst"
+export CNTL_DIR="cpld_bmark_v16_nsst"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
@@ -104,9 +104,6 @@ export CPL_FAST=${DT_ATMOS}
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
diff --git a/tests/tests/cpld_bmark_wave b/tests/tests/cpld_bmark_wave
deleted file mode 100644
index a7237abf7d..0000000000
--- a/tests/tests/cpld_bmark_wave
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-#  cpld_bmark_wave test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384 MX025 - Benchmark test with waves"
-
-export CNTL_DIR="cpld_bmark_wave"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   20130402.000000.out_grd.gwes_30m \
-                   20130402.000000.out_pnt.points \
-                   20130402.000000.restart.gwes_30m \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
-
-export_fv3
-export_cpl
-
-export SYEAR="2013"
-export SMONTH="04"
-export SDAY="01"
-export SHOUR="00"
-
-export WLCLK=60
-
-export TASKS=$TASKS_cpl_wwav
-export TPN=$TPN_cpl_wwav
-export INPES=$INPES_cpl_wwav
-export JNPES=$JNPES_cpl_wwav
-export THRD=$THRD_cpl_wwav
-export WRTTASK_PER_GROUP=$WPG_cpl_wwav
-
-export med_petlist_bounds=$MPB_cpl_wwav
-export atm_petlist_bounds=$APB_cpl_wwav
-export ocn_petlist_bounds=$OPB_cpl_wwav
-export ice_petlist_bounds=$IPB_cpl_wwav
-export wav_petlist_bounds=$WPB_cpl_wwav
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export CPLWAV='.T.'
-export CPLWAV2ATM='.T.'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_USE_WAVES='True'
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_bmark_wave_35d b/tests/tests/cpld_bmark_wave_35d
deleted file mode 100644
index 67a8d5030e..0000000000
--- a/tests/tests/cpld_bmark_wave_35d
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-#  cpld_bmark_wave 35D
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384 MX025 - Benchmark 35d test with waves"
-
-export_35d_run
-export_fv3
-export_cpl
-
-export SYEAR
-export SMONTH
-export SDAY="01"
-export SHOUR="00"
-
-export DAYS="35"
-export FHMAX="840"
-export RESTART_N=${FHMAX}
-export WLCLK=480
-
-#export TASKS=$TASKS_cpl_wwav
-#export TPN=$TPN_cpl_wwav
-#export INPES=$INPES_cpl_wwav
-#export JNPES=$JNPES_cpl_wwav
-#export THRD=$THRD_cpl_wwav
-#export WRTTASK_PER_GROUP=$WPG_cpl_wwav
-
-#export med_petlist_bounds=$MPB_cpl_wwav
-#export atm_petlist_bounds=$APB_cpl_wwav
-#export ocn_petlist_bounds=$OPB_cpl_wwav
-#export ice_petlist_bounds=$IPB_cpl_wwav
-#export wav_petlist_bounds=$WPB_cpl_wwav
-
-export TASKS=866
-export TPN=40
-export INPES=6
-export JNPES=12
-export THRD=1
-export WRTTASK_PER_GROUP=24
-
-export med_petlist_bounds="0 431"
-export atm_petlist_bounds="0 455"
-export ocn_petlist_bounds="456 695"
-export ice_petlist_bounds="696 743"
-export wav_petlist_bounds="744 865"
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export CPLWAV='.T.'
-export CPLWAV2ATM='.T.'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_USE_WAVES='True'
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export RT35D='.T.'
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_bmarkfrac_wave_v16 b/tests/tests/cpld_bmark_wave_v16
similarity index 95%
rename from tests/tests/cpld_bmarkfrac_wave_v16
rename to tests/tests/cpld_bmark_wave_v16
index f028fd3650..a682b2dd36 100644
--- a/tests/tests/cpld_bmarkfrac_wave_v16
+++ b/tests/tests/cpld_bmark_wave_v16
@@ -1,9 +1,9 @@
 #
-#  cpld_bmarkfrac_wave_v16 test
+#  cpld_bmark_wave_v16 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark test with waves-frac grid - v16"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark test with waves- v16"
 
-export CNTL_DIR="cpld_bmarkfrac_wave_v16"
+export CNTL_DIR="cpld_bmark_wave_v16"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
@@ -104,9 +104,6 @@ export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
@@ -156,7 +153,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 
diff --git a/tests/tests/cpld_bmarkfrac_wave_v16_35d b/tests/tests/cpld_bmark_wave_v16_35d
similarity index 97%
rename from tests/tests/cpld_bmarkfrac_wave_v16_35d
rename to tests/tests/cpld_bmark_wave_v16_35d
index c3c3c61069..0e96541dee 100644
--- a/tests/tests/cpld_bmarkfrac_wave_v16_35d
+++ b/tests/tests/cpld_bmark_wave_v16_35d
@@ -95,9 +95,6 @@ export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
@@ -147,7 +144,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 
diff --git a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp b/tests/tests/cpld_bmark_wave_v16_noahmp
similarity index 95%
rename from tests/tests/cpld_bmarkfrac_wave_v16_noahmp
rename to tests/tests/cpld_bmark_wave_v16_noahmp
index 80ba43efd0..fd674f86a8 100644
--- a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp
+++ b/tests/tests/cpld_bmark_wave_v16_noahmp
@@ -1,9 +1,9 @@
 #
-#  cpld_bmarkfrac_wave_v16 NoahMP test
+#  cpld_bmark_wave_v16 NoahMP test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark test with waves-frac grid - v16 NoahMP"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark test with waves - v16 NoahMP"
 
-export CNTL_DIR="cpld_bmarkfrac_wave_v16_noahmp"
+export CNTL_DIR="cpld_bmark_wave_v16_noahmp"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
@@ -104,9 +104,6 @@ export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
@@ -156,7 +153,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 
diff --git a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_35d b/tests/tests/cpld_bmark_wave_v16_noahmp_35d
similarity index 98%
rename from tests/tests/cpld_bmarkfrac_wave_v16_noahmp_35d
rename to tests/tests/cpld_bmark_wave_v16_noahmp_35d
index 5149f95c3a..61e1708031 100644
--- a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_35d
+++ b/tests/tests/cpld_bmark_wave_v16_noahmp_35d
@@ -96,9 +96,6 @@ export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
@@ -149,6 +146,7 @@ export MOM6_REPRO_LA='True'
 export RUNID="cpcice"
 
 export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 
diff --git a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_nsst b/tests/tests/cpld_bmark_wave_v16_noahmp_nsst
similarity index 94%
rename from tests/tests/cpld_bmarkfrac_wave_v16_noahmp_nsst
rename to tests/tests/cpld_bmark_wave_v16_noahmp_nsst
index 5b2422604c..48c3e5a830 100644
--- a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_nsst
+++ b/tests/tests/cpld_bmark_wave_v16_noahmp_nsst
@@ -1,9 +1,9 @@
 #
-#  cpld_bmarkfrac_wave_v16 NoahMP NSST test
+#  cpld_bmark_wave_v16 NoahMP NSST test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark test with waves-frac grid - v16 NoahMP NSST"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark test with waves - v16 NoahMP NSST"
 
-export CNTL_DIR="cpld_bmarkfrac_wave_v16_noahmp_nsst"
+export CNTL_DIR="cpld_bmark_wave_v16_noahmp_nsst"
 
 export LIST_FILES="phyf006.nc \
                    dynf006.nc \
@@ -104,9 +104,6 @@ export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
@@ -157,7 +154,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 
diff --git a/tests/tests/cpld_bmarkfrac b/tests/tests/cpld_bmarkfrac
deleted file mode 100644
index 574c3dfea6..0000000000
--- a/tests/tests/cpld_bmarkfrac
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-#  cpld_bmarkfrac test
-#
-
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 - Benchmark test - frac grid"
-
-export CNTL_DIR="cpld_bmarkfrac"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
-
-export_fv3
-export_cpl
-
-export RESTART_INTERVAL="12"
-export RESTART_N=${RESTART_INTERVAL}
-
-export SYEAR="2013"
-export SMONTH="04"
-export SDAY="01"
-export SHOUR="00"
-
-export TASKS=$TASKS_cpl_bmrk
-export TPN=$TPN_cpl_bmrk
-export INPES=$INPES_cpl_bmrk
-export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
-
-export med_petlist_bounds=$MPB_cpl_bmrk
-export atm_petlist_bounds=$APB_cpl_bmrk
-export ocn_petlist_bounds=$OPB_cpl_bmrk
-export ice_petlist_bounds=$IPB_cpl_bmrk
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_bmarkfrac_wave b/tests/tests/cpld_bmarkfrac_wave
deleted file mode 100644
index f19a958979..0000000000
--- a/tests/tests/cpld_bmarkfrac_wave
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-#  cpld_bmarkfrac_wave test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384 MX025 - Benchmark test with waves - frac grid"
-
-export CNTL_DIR="cpld_bmarkfrac_wave"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   20130402.000000.out_grd.gwes_30m \
-                   20130402.000000.out_pnt.points \
-                   20130402.000000.restart.gwes_30m \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
-
-export_fv3
-export_cpl
-
-export SYEAR="2013"
-export SMONTH="04"
-export SDAY="01"
-export SHOUR="00"
-
-export WLCLK=60
-
-export TASKS=$TASKS_cpl_wwav
-export TPN=$TPN_cpl_wwav
-export INPES=$INPES_cpl_wwav
-export JNPES=$JNPES_cpl_wwav
-export THRD=$THRD_cpl_wwav
-export WRTTASK_PER_GROUP=$WPG_cpl_wwav
-
-export med_petlist_bounds=$MPB_cpl_wwav
-export atm_petlist_bounds=$APB_cpl_wwav
-export ocn_petlist_bounds=$OPB_cpl_wwav
-export ice_petlist_bounds=$IPB_cpl_wwav
-export wav_petlist_bounds=$WPB_cpl_wwav
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-export CPLWAV='.T.'
-export CPLWAV2ATM='.T.'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_USE_WAVES='True'
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
-
-export RUNID="cpcice"
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_bmarkfrac_wave_35d b/tests/tests/cpld_bmarkfrac_wave_35d
deleted file mode 100644
index 05651b6d5b..0000000000
--- a/tests/tests/cpld_bmarkfrac_wave_35d
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-#  cpld_bmarkfrac_wave 35D
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384 MX025 - Benchmark 35d test with waves - frac grid"
-
-export_35d_run
-export_fv3
-export_cpl
-
-export SYEAR
-export SMONTH
-export SDAY="01"
-export SHOUR="00"
-
-export DAYS="35"
-export FHMAX="840"
-export RESTART_N=${FHMAX}
-export WW3RSTDTHR=${FHMAX}
-export WLCLK=480
-
-#export TASKS=$TASKS_cpl_wwav
-#export TPN=$TPN_cpl_wwav
-#export INPES=$INPES_cpl_wwav
-#export JNPES=$JNPES_cpl_wwav
-#export THRD=$THRD_cpl_wwav
-#export WRTTASK_PER_GROUP=$WPG_cpl_wwav
-
-#export med_petlist_bounds=$MPB_cpl_wwav
-#export atm_petlist_bounds=$APB_cpl_wwav
-#export ocn_petlist_bounds=$OPB_cpl_wwav
-#export ice_petlist_bounds=$IPB_cpl_wwav
-#export wav_petlist_bounds=$WPB_cpl_wwav
-
-export TASKS=866
-export TPN=40
-export INPES=6
-export JNPES=12
-export THRD=1
-export WRTTASK_PER_GROUP=24
-
-export med_petlist_bounds="0 431"
-export atm_petlist_bounds="0 455"
-export ocn_petlist_bounds="456 695"
-export ice_petlist_bounds="696 743"
-export wav_petlist_bounds="744 865"
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-export CPLWAV='.T.'
-export CPLWAV2ATM='.T.'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_USE_WAVES='True'
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export RT35D='.T.'
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_control_c384 b/tests/tests/cpld_control_c384
index 566d6b6cd2..38c7035267 100644
--- a/tests/tests/cpld_control_c384
+++ b/tests/tests/cpld_control_c384
@@ -5,18 +5,18 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025"
 
 export CNTL_DIR="cpld_control_c384"
 
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
+export LIST_FILES="sfcf012.tile1.nc \
+                   sfcf012.tile2.nc \
+                   sfcf012.tile3.nc \
+                   sfcf012.tile4.nc \
+                   sfcf012.tile5.nc \
+                   sfcf012.tile6.nc \
+                   atmf012.tile1.nc \
+                   atmf012.tile2.nc \
+                   atmf012.tile3.nc \
+                   atmf012.tile4.nc \
+                   atmf012.tile5.nc \
+                   atmf012.tile6.nc \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,13 +53,15 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-04-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-03-43200.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
 
 export_fv3
 export_cpl
 
-export RESTART_INTERVAL="12"
+export DAYS='0.50'
+export FHMAX='12'
+export RESTART_INTERVAL="6"
 export RESTART_N=${RESTART_INTERVAL}
 
 export TASKS=$TASKS_cpl_c384
diff --git a/tests/tests/cpld_controlfrac b/tests/tests/cpld_controlfrac
deleted file mode 100644
index 22fb1ba6c7..0000000000
--- a/tests/tests/cpld_controlfrac
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#  cpld_controlfrac test
-#
-
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - frac grid"
-
-export CNTL_DIR="cpld_controlfrac"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
-
-export_fv3
-export_cpl
-
-export RESTART_INTERVAL="12"
-export RESTART_N=${RESTART_INTERVAL}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_controlfrac_c192 b/tests/tests/cpld_controlfrac_c192
deleted file mode 100644
index 25f77087e9..0000000000
--- a/tests/tests/cpld_controlfrac_c192
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-#  cpld_controlfrac_c192 test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - frac grid"
-
-export CNTL_DIR="cpld_controlfrac_c192"
-
-export LIST_FILES="sfcf048.tile1.nc \
-                   sfcf048.tile2.nc \
-                   sfcf048.tile3.nc \
-                   sfcf048.tile4.nc \
-                   sfcf048.tile5.nc \
-                   sfcf048.tile6.nc \
-                   atmf048.tile1.nc \
-                   atmf048.tile2.nc \
-                   atmf048.tile3.nc \
-                   atmf048.tile4.nc \
-                   atmf048.tile5.nc \
-                   atmf048.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-05-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc"
-
-export_fv3
-export_cpl
-
-export DAYS="2"
-export FHMAX="48"
-export RESTART_INTERVAL="12"
-export RESTART_N=${RESTART_INTERVAL}
-
-export TASKS=$TASKS_cpl_c192
-export TPN=$TPN_cpl_c192
-export INPES=$INPES_cpl_c192
-export JNPES=$JNPES_cpl_c192
-export THRD=$THRD_cpl_c192
-export WRTTASK_PER_GROUP=$WPG_cpl_c192
-export WRITE_GROUP=1
-
-export med_petlist_bounds=$MPB_cpl_c192
-export atm_petlist_bounds=$APB_cpl_c192
-export ocn_petlist_bounds=$OPB_cpl_c192
-export ice_petlist_bounds=$IPB_cpl_c192
-
-# atm/ocn/ice resolution
-export ATMRES='C192'
-export NPX=193
-export NPY=193
-export IMO=768
-export JMO=384
-
-export OCNRES='050'
-export ICERES='0.50'
-export NX_GLB=720
-export NY_GLB=576
-export NPROC_ICE='24'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c192}
-
-# set component and coupling timesteps
-export DT_ATMOS='900'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='1800'
-export DT_THERM_MOM6='3600'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t382.768.384.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t382.768.384.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t382.768.384.rg.grb',"
-export FNSMCC="'global_soilmgldas.t382.768.384.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t382.768.384.rg.grb',"
-
-export MOM6_RIVER_RUNOFF='True'
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_controlfrac_c384 b/tests/tests/cpld_controlfrac_c384
deleted file mode 100644
index 098363fbeb..0000000000
--- a/tests/tests/cpld_controlfrac_c384
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-#  cpld_controlfrac_c384 frac grid test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 - frac grid "
-
-export CNTL_DIR="cpld_controlfrac_c384"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-04-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
-
-export_fv3
-export_cpl
-
-export RESTART_INTERVAL="12"
-export RESTART_N=${RESTART_INTERVAL}
-
-export TASKS=$TASKS_cpl_c384
-export TPN=$TPN_cpl_c384
-export INPES=$INPES_cpl_c384
-export JNPES=$JNPES_cpl_c384
-export THRD=$THRD_cpl_c384
-export WRTTASK_PER_GROUP=$WPG_cpl_c384
-
-export med_petlist_bounds=$MPB_cpl_c384
-export atm_petlist_bounds=$APB_cpl_c384
-export ocn_petlist_bounds=$OPB_cpl_c384
-export ice_petlist_bounds=$IPB_cpl_c384
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export MOM6_RIVER_RUNOFF='True'
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug b/tests/tests/cpld_debug
index 4c9c2a671d..b799d79845 100644
--- a/tests/tests/cpld_debug
+++ b/tests/tests/cpld_debug
@@ -60,8 +60,6 @@ export_cpl
 export DAYS="0.25"
 export FHMAX="6"
 export NFHOUT_HF="1"
-# requires extra time
-export WLCLK=60
 
 export RESTART_N=${FHMAX}
 
diff --git a/tests/tests/cpld_debugfrac b/tests/tests/cpld_debugfrac
deleted file mode 100644
index 1f53da8497..0000000000
--- a/tests/tests/cpld_debugfrac
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-#  cpld_debugfrac test
-#
-
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - debug - frac grid"
-
-export CNTL_DIR="cpld_debugfrac"
-
-export LIST_FILES="sfcf006.tile1.nc \
-                   sfcf006.tile2.nc \
-                   sfcf006.tile3.nc \
-                   sfcf006.tile4.nc \
-                   sfcf006.tile5.nc \
-                   sfcf006.tile6.nc \
-                   atmf006.tile1.nc \
-                   atmf006.tile2.nc \
-                   atmf006.tile3.nc \
-                   atmf006.tile4.nc \
-                   atmf006.tile5.nc \
-                   atmf006.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-03-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc"
-
-export_fv3
-export_cpl
-
-export DAYS="0.25"
-export FHMAX="6"
-export NFHOUT_HF="1"
-# requires extra time
-export WLCLK=60
-
-export RESTART_N=${FHMAX}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_bmark b/tests/tests/cpld_restart_bmark
deleted file mode 100644
index 89e68bcc63..0000000000
--- a/tests/tests/cpld_restart_bmark
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-#  cpld_restart_bmark test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 - Benchmark test - restart"
-
-export CNTL_DIR="cpld_bmark"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
-
-export_fv3
-export_cpl
-
-export SYEAR="2013"
-export SMONTH="04"
-export SDAY="01"
-export SHOUR="00"
-
-export FHROT='12'
-export RESTART_N=$((FHMAX-$FHROT))
-
-export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT}  )))0000"
-export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} )))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT}*3600 )))"
-
-export TASKS=$TASKS_cpl_bmrk
-export TPN=$TPN_cpl_bmrk
-export INPES=$INPES_cpl_bmrk
-export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
-
-export med_petlist_bounds=$MPB_cpl_bmrk
-export atm_petlist_bounds=$APB_cpl_bmrk
-export ocn_petlist_bounds=$OPB_cpl_bmrk
-export ice_petlist_bounds=$IPB_cpl_bmrk
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-# ATM warm start
-WARM_START='.T.'
-MAKE_NH='.F.'
-NA_INIT='0'
-EXTERNAL_IC='.F.'
-NGGPS_IC='.F.'
-MOUNTAIN='.T.'
-
-# ICE warm start
-RUNTYPE='continue'
-export USE_RESTART_TIME='.true.'
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_restart_bmarkfrac_v16 b/tests/tests/cpld_restart_bmark_v16
similarity index 96%
rename from tests/tests/cpld_restart_bmarkfrac_v16
rename to tests/tests/cpld_restart_bmark_v16
index 5d3f9bd8f8..46db98a50e 100644
--- a/tests/tests/cpld_restart_bmarkfrac_v16
+++ b/tests/tests/cpld_restart_bmark_v16
@@ -1,10 +1,10 @@
 #
-#  cpld_restart_bmarkfrac_v16 test
+#  cpld_restart_bmark_v16 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - Benchmark test - restart - frac grid - v16"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - Benchmark test - restart - v16"
 
-export CNTL_DIR="cpld_bmarkfrac_v16"
+export CNTL_DIR="cpld_bmark_v16"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
@@ -108,9 +108,6 @@ export CPL_FAST=${DT_ATMOS}
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
 export NPZ=127
 export NPZP=128
 export PSM_BC=1
diff --git a/tests/tests/cpld_restart_bmarkfrac b/tests/tests/cpld_restart_bmarkfrac
deleted file mode 100644
index 5cc7f29b8d..0000000000
--- a/tests/tests/cpld_restart_bmarkfrac
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-#  cpld_restart_bmarkfrac test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 - Benchmark test - restart - frac grid"
-
-export CNTL_DIR="cpld_bmarkfrac"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
-
-export_fv3
-export_cpl
-
-export SYEAR="2013"
-export SMONTH="04"
-export SDAY="01"
-export SHOUR="00"
-
-export FHROT='12'
-export RESTART_N=$((FHMAX-$FHROT))
-
-export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT}  )))0000"
-export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} )))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT}*3600 )))"
-
-export TASKS=$TASKS_cpl_bmrk
-export TPN=$TPN_cpl_bmrk
-export INPES=$INPES_cpl_bmrk
-export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
-
-export med_petlist_bounds=$MPB_cpl_bmrk
-export atm_petlist_bounds=$APB_cpl_bmrk
-export ocn_petlist_bounds=$OPB_cpl_bmrk
-export ice_petlist_bounds=$IPB_cpl_bmrk
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export OZ_PHYS_NEW=".T."
-
-export MOM6_RIVER_RUNOFF='True'
-export MOM6_RESTART_SETTING="r"
-export MOM6_REPRO_LA='True'
-
-export RUNID="cpcice"
-
-# ATM warm start
-WARM_START='.T.'
-MAKE_NH='.F.'
-NA_INIT='0'
-EXTERNAL_IC='.F.'
-NGGPS_IC='.F.'
-MOUNTAIN='.T.'
-
-# ICE warm start
-RUNTYPE='continue'
-export USE_RESTART_TIME='.true.'
-
-export INPUT_NML=input.benchmark_ccpp.nml.IN
-
-export FIELD_TABLE="field_table.gfdlmp"
-export DIAG_TABLE="diag_table_bmark_template"
-export CCPP_SUITE="FV3_GFS_v15p2_coupled"
-
-export FV3_RUN=cpld_bmark_run.IN
diff --git a/tests/tests/cpld_restart_c384 b/tests/tests/cpld_restart_c384
index 12ab8217d7..0b59f65c48 100644
--- a/tests/tests/cpld_restart_c384
+++ b/tests/tests/cpld_restart_c384
@@ -5,18 +5,18 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 -
 
 export CNTL_DIR="cpld_control_c384"
 
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
+export LIST_FILES="sfcf012.tile1.nc \
+                   sfcf012.tile2.nc \
+                   sfcf012.tile3.nc \
+                   sfcf012.tile4.nc \
+                   sfcf012.tile5.nc \
+                   sfcf012.tile6.nc \
+                   atmf012.tile1.nc \
+                   atmf012.tile2.nc \
+                   atmf012.tile3.nc \
+                   atmf012.tile4.nc \
+                   atmf012.tile5.nc \
+                   atmf012.tile6.nc \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,13 +53,15 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-04-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-03-43200.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
 
 export_fv3
 export_cpl
 
-export FHROT='12'
+export DAYS='0.50'
+export FHMAX='12'
+export FHROT='6'
 export RESTART_N=$((FHMAX-$FHROT))
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT}  )))0000"
diff --git a/tests/tests/cpld_restartfrac b/tests/tests/cpld_restartfrac
deleted file mode 100644
index 2495994433..0000000000
--- a/tests/tests/cpld_restartfrac
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-#  cpld_restartfrac test
-#
-
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - restart - frac grid"
-
-export CNTL_DIR="cpld_controlfrac"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
-
-export_fv3
-export_cpl
-
-export FHROT='12'
-export RESTART_N=$((FHMAX-$FHROT))
-
-export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT}  )))0000"
-export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} )))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT}*3600 )))"
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-# ATM warm start
-WARM_START='.T.'
-MAKE_NH='.F.'
-NA_INIT='0'
-EXTERNAL_IC='.F.'
-NGGPS_IC='.F.'
-MOUNTAIN='.T.'
-
-# ICE warm start
-RUNTYPE='continue'
-export USE_RESTART_TIME='.true.'
-
-# MOM6 warm start
-export MOM6_RESTART_SETTING="r"
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restartfrac_c192 b/tests/tests/cpld_restartfrac_c192
deleted file mode 100644
index cc38f911be..0000000000
--- a/tests/tests/cpld_restartfrac_c192
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-#  cpld_restartfrac_c192 test
-#
-
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - 36h restart - frac grid"
-
-export CNTL_DIR="cpld_controlfrac_c192"
-
-export LIST_FILES="sfcf048.tile1.nc \
-                   sfcf048.tile2.nc \
-                   sfcf048.tile3.nc \
-                   sfcf048.tile4.nc \
-                   sfcf048.tile5.nc \
-                   sfcf048.tile6.nc \
-                   atmf048.tile1.nc \
-                   atmf048.tile2.nc \
-                   atmf048.tile3.nc \
-                   atmf048.tile4.nc \
-                   atmf048.tile5.nc \
-                   atmf048.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-05-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc"
-
-export_fv3
-export_cpl
-
-export DAYS="2"
-export FHMAX="48"
-export FHROT='12'
-export RESTART_N=$((FHMAX-$FHROT))
-
-export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT}  )))0000"
-export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} )))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT}*3600 )))"
-
-export TASKS=$TASKS_cpl_c192
-export TPN=$TPN_cpl_c192
-export INPES=$INPES_cpl_c192
-export JNPES=$JNPES_cpl_c192
-export THRD=$THRD_cpl_c192
-export WRTTASK_PER_GROUP=$WPG_cpl_c192
-export WRITE_GROUP=1
-
-export med_petlist_bounds=$MPB_cpl_c192
-export atm_petlist_bounds=$APB_cpl_c192
-export ocn_petlist_bounds=$OPB_cpl_c192
-export ice_petlist_bounds=$IPB_cpl_c192
-
-# atm/ocn/ice resolution
-export ATMRES='C192'
-export NPX=193
-export NPY=193
-export IMO=768
-export JMO=384
-
-export OCNRES='050'
-export ICERES='0.50'
-export NX_GLB=720
-export NY_GLB=576
-export NPROC_ICE='24'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c192}
-
-# set component and coupling timesteps
-export DT_ATMOS='900'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='1800'
-export DT_THERM_MOM6='3600'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t382.768.384.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t382.768.384.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t382.768.384.rg.grb',"
-export FNSMCC="'global_soilmgldas.t382.768.384.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t382.768.384.rg.grb',"
-
-export MOM6_RIVER_RUNOFF='True'
-
-# ATM warm start
-WARM_START='.T.'
-MAKE_NH='.F.'
-NA_INIT='0'
-EXTERNAL_IC='.F.'
-NGGPS_IC='.F.'
-MOUNTAIN='.T.'
-
-# ICE warm start
-RUNTYPE='continue'
-export USE_RESTART_TIME='.true.'
-
-# MOM6 warm start
-export MOM6_RESTART_SETTING="r"
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restartfrac_c384 b/tests/tests/cpld_restartfrac_c384
deleted file mode 100644
index 318e431ca5..0000000000
--- a/tests/tests/cpld_restartfrac_c384
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-#  cpld_restartfrac_c384 test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384 MX025 - restart - frac grid"
-
-export CNTL_DIR="cpld_controlfrac_c384"
-
-export LIST_FILES="sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-04-00000.nc \
-                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
-
-export_fv3
-export_cpl
-
-export FHROT='12'
-export RESTART_N=$((FHMAX-$FHROT))
-
-export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT}  )))0000"
-export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} )))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT}*3600 )))"
-
-export TASKS=$TASKS_cpl_c384
-export TPN=$TPN_cpl_c384
-export INPES=$INPES_cpl_c384
-export JNPES=$JNPES_cpl_c384
-export THRD=$THRD_cpl_c384
-export WRTTASK_PER_GROUP=$WPG_cpl_c384
-
-export med_petlist_bounds=$MPB_cpl_c384
-export atm_petlist_bounds=$APB_cpl_c384
-export ocn_petlist_bounds=$OPB_cpl_c384
-export ice_petlist_bounds=$IPB_cpl_c384
-
-# atm/ocn/ice resolution
-export ATMRES='C384'
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-
-export OCNRES='025'
-export ICERES='0.25'
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE='48'
-
-# resolution dependent setting
-export CDMBWD=${CDMBWD_c384}
-
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-# nems.configure
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
-
-export FRAC_GRID='.T.'
-export CPLMODE='nems_frac'
-
-# resolution dependent files
-export MOM_INPUT="MOM_input_template_${OCNRES}"
-export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
-export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
-export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
-export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
-export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNSMCC="'global_soilmgldas.t766.1536.768.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export MOM6_RIVER_RUNOFF='True'
-
-# ATM warm start
-WARM_START='.T.'
-MAKE_NH='.F.'
-NA_INIT='0'
-EXTERNAL_IC='.F.'
-NGGPS_IC='.F.'
-MOUNTAIN='.T.'
-
-# ICE warm start
-RUNTYPE='continue'
-export USE_RESTART_TIME='.true.'
-
-# MOM6 warm start
-export MOM6_RESTART_SETTING="r"
-
-export FV3_RUN=cpld_control_run.IN