diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 0cd1388792..ffcf0597e1 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -418,9 +418,9 @@ export MOM6_RESTART_SETTING='n'
 export MOM6_RIVER_RUNOFF='False'
 export FRUNOFF=""
 export CHLCLIM="seawifs_1998-2006_smoothed_2X.nc"
-# this must be set False for restart repro 
+# this must be set False for restart repro
 export MOM6_REPRO_LA='False'
-# since CPL_SLOW is set to DT_THERM, this should be always be false 
+# since CPL_SLOW is set to DT_THERM, this should be always be false
 export MOM6_THERMO_SPAN='False'
 # no WW3
 export MOM6_USE_WAVES='False'
diff --git a/tests/edit_inputs.sh b/tests/edit_inputs.sh
index 0d5640e83e..0b0a9527fc 100755
--- a/tests/edit_inputs.sh
+++ b/tests/edit_inputs.sh
@@ -41,11 +41,11 @@ function edit_mom_input {
       -e "s/MOM6_USE_WAVES/$MOM6_USE_WAVES/g" \
       -e "s/NX_GLB/$NX_GLB/g" \
       -e "s/NY_GLB/$NY_GLB/g" \
-      -e "s/CHLCLIM/$CHLCLIM/g" 
+      -e "s/CHLCLIM/$CHLCLIM/g"
 }
 
 function edit_data_table {
-  sed -e "s/FRUNOFF/$FRUNOFF/g" 
+  sed -e "s/FRUNOFF/$FRUNOFF/g"
 }
 
 function edit_diag_table {
diff --git a/tests/fv3_conf/cpld_bmark_run.IN b/tests/fv3_conf/cpld_bmark_run.IN
index ad159842e6..b144f54c28 100644
--- a/tests/fv3_conf/cpld_bmark_run.IN
+++ b/tests/fv3_conf/cpld_bmark_run.IN
@@ -1,4 +1,4 @@
-mkdir INPUT RESTART history MOM6_OUTPUT 
+mkdir INPUT RESTART history MOM6_OUTPUT
 
 if [[ $ATMRES == 'C96' ]]; then
   FV3_DIR=FV3_input_data
@@ -58,4 +58,3 @@ cp    @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
 cp    @[RTPWD]/${MOM6_IC}/MOM*.nc ./INPUT
 # the BM ICs are still named cice5 and need to remain so until P5.0 is completed
 cp    @[RTPWD]/${CICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
-
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
index 63c1c9a99c..ee49c1dacf 100644
--- a/tests/fv3_conf/cpld_control_run.IN
+++ b/tests/fv3_conf/cpld_control_run.IN
@@ -1,4 +1,4 @@
-mkdir INPUT RESTART history MOM6_OUTPUT 
+mkdir INPUT RESTART history MOM6_OUTPUT
 
 if [[ $ATMRES == 'C96' ]]; then
   FV3_DIR=FV3_input_data
diff --git a/tests/tests/cpld_ca b/tests/tests/cpld_ca
index 0dddd5c597..99720548d0 100644
--- a/tests/tests/cpld_ca
+++ b/tests/tests/cpld_ca
@@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc "
+                   RESTART/iced.2016-10-04-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_control b/tests/tests/cpld_control
index b3f2d70d10..c4efec6909 100644
--- a/tests/tests/cpld_control
+++ b/tests/tests/cpld_control
@@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc "
+                   RESTART/iced.2016-10-04-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_control_12h b/tests/tests/cpld_control_12h
index fb2f7037e9..fcb32f561b 100644
--- a/tests/tests/cpld_control_12h
+++ b/tests/tests/cpld_control_12h
@@ -51,7 +51,7 @@ export LIST_FILES="phyf012.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-03-43200.nc "
+                   RESTART/iced.2016-10-03-43200.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_control_c192 b/tests/tests/cpld_control_c192
index e7901a4563..68015d4701 100644
--- a/tests/tests/cpld_control_c192
+++ b/tests/tests/cpld_control_c192
@@ -50,7 +50,7 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc "
+                   RESTART/iced.2016-10-04-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_debug b/tests/tests/cpld_debug
index ab0dd8c622..106193231d 100644
--- a/tests/tests/cpld_debug
+++ b/tests/tests/cpld_debug
@@ -51,7 +51,7 @@ export LIST_FILES="phyf006.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-03-21600.nc "
+                   RESTART/iced.2016-10-03-21600.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_decomp b/tests/tests/cpld_decomp
index 940157942e..992deda62d 100644
--- a/tests/tests/cpld_decomp
+++ b/tests/tests/cpld_decomp
@@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc "
+                   RESTART/iced.2016-10-04-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_restart b/tests/tests/cpld_restart
index 2df4bbbbb3..733c5a1253 100644
--- a/tests/tests/cpld_restart
+++ b/tests/tests/cpld_restart
@@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc "
+                   RESTART/iced.2016-10-04-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_restart_mx025 b/tests/tests/cpld_restart_mx025
index 6b6df4b0c1..f9bbada8d9 100644
--- a/tests/tests/cpld_restart_mx025
+++ b/tests/tests/cpld_restart_mx025
@@ -54,7 +54,7 @@ export LIST_FILES="phyf024.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/iced.2016-10-04-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
diff --git a/tests/tests/cpld_satmedmf b/tests/tests/cpld_satmedmf
index bf45bd1e17..76c2a4e603 100644
--- a/tests/tests/cpld_satmedmf
+++ b/tests/tests/cpld_satmedmf
@@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc "
+                   RESTART/iced.2016-10-04-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3