diff --git a/scripts/acme/update_acme_tests.py b/scripts/acme/update_acme_tests.py
index 4f6a86c1a62b..029b368d8a34 100755
--- a/scripts/acme/update_acme_tests.py
+++ b/scripts/acme/update_acme_tests.py
@@ -29,17 +29,17 @@
                          'SMS.f19_f19.I1850CLM45CN']
                         ),
     "acme_integration" : ("acme_developer",
-                          ["ERB.f19_g16.B1850C5",
+                          ["ERB.ne16_g37.B1850C5",
                            "ERB.f45_g37.B1850C5",
                            "ERH.f45_g37.B1850C5",
-                           "ERS.f09_g16.B1850C5",
+                           "ERS.ne30_g16.B1850C5",
                            "ERS.f19_f19.FAMIPC5",
-                           "ERS.f19_g16.B1850C5",
+                           "ERS.ne16_g37.B1850C5",
                            "ERS_D.f45_g37.B1850C5",
                            "ERS_IOP_Ld3.f19_f19.FAMIPC5",
-                           "ERS_Ld3.f19_g16.FC5",
+                           "ERS_Ld3.ne16_g37.FC5",
                            "ERS_Ld3.ne30_ne30.FC5",
-                           "ERT.f19_g16.B1850C5",
+                           "ERT.ne16_g37.B1850C5",
                            "PET_PT.f19_g16.X",
                            "PET_PT.f45_g37_rx1.A",
                            "PFS.ne30_ne30.FC5",
@@ -47,7 +47,7 @@
                            "SEQ_PFC.f45_g37.B1850C5",
                            "SMS.ne16_ne16.FC5AQUAP",
                            "SMS_D.f19_g16.B20TRC5",
-                           "SMS_D_Ld3.f19_f19.FC5"]
+                           "SMS_D_Ld3.ne16_ne16.FC5"]
                           ),
 }
 
diff --git a/scripts/ccsm_utils/Machines/mkbatch.cascade b/scripts/ccsm_utils/Machines/mkbatch.cascade
index 652951cdae72..28808bcadab7 100755
--- a/scripts/ccsm_utils/Machines/mkbatch.cascade
+++ b/scripts/ccsm_utils/Machines/mkbatch.cascade
@@ -17,8 +17,8 @@ if ( $ntasks % ${MAX_TASKS_PER_NODE} > 0) then
 endif
 @ taskpernode = ${MAX_TASKS_PER_NODE} / ${maxthrds}
 set qname = batch
-set tlimit = "00:59:00"
-if ($CCSM_ESTCOST > 2) set tlimit = "00:59:00"
+set tlimit = "07:59:00"
+if ($CCSM_ESTCOST > 2) set tlimit = "07:59:00"
 
 if ($?TESTMODE) then
  set file = $CASEROOT/${CASE}.test 
diff --git a/scripts/ccsm_utils/Testlistxml/testlist.xml b/scripts/ccsm_utils/Testlistxml/testlist.xml
index b57a8b56d38b..cb0e5136f522 100644
--- a/scripts/ccsm_utils/Testlistxml/testlist.xml
+++ b/scripts/ccsm_utils/Testlistxml/testlist.xml
@@ -1220,6 +1220,49 @@
     </grid>
     <grid name="f09_g16">
       <test name="ERS">
+        <machine compiler="pgi" testtype="aux_cam">titan</machine>
+        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
+      </test>
+    </grid>
+    <grid name="f19_g16">
+      <test name="ERB">
+        <machine compiler="pgi" testtype="aux_cam">titan</machine>
+        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
+        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
+      </test>
+      <test name="ERH">
+        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
+      </test>
+      <test name="ERS">
+        <machine compiler="pgi" testtype="aux_cam">titan</machine>
+        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
+        <machine compiler="intel" testtype="aux_science">yellowstone</machine>
+      </test>
+      <test name="ERT">
+        <machine compiler="pgi" testtype="aux_cam">titan</machine>
+        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
+        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
+      </test>
+      <test name="PET_PT">
+        <machine compiler="pgi" testtype="prebeta">bluewaters</machine>
+        <machine compiler="intel" testtype="prebeta">edison</machine>
+        <machine compiler="intel" testtype="prebeta">eos</machine>
+        <machine compiler="pgi" testtype="prebeta">hopper</machine>
+        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
+        <machine compiler="intel" testtype="prebeta">lawrencium-lr2</machine>
+        <machine compiler="pgi" testtype="prebeta">titan</machine>
+        <machine compiler="pgi" testtype="prerelease">titan</machine>
+      </test>
+      <test name="SMS_D">
+        <machine compiler="pgi" testtype="prerelease">hopper</machine>
+        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
+      </test>
+      <test name="SMS_DE">
+        <machine compiler="intel" testtype="aux_esmf">yellowstone</machine>
+      </test>
+    </grid>
+    <grid name="f45_g37">
+      <test name="ERB">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -1251,7 +1294,6 @@
         <machine compiler="intel" testtype="acme_integration">skybridge</machine>
         <machine compiler="intel" testtype="acme_integration">titan</machine>
         <machine compiler="pgi" testtype="acme_integration">titan</machine>
-        <machine compiler="pgi" testtype="aux_cam">titan</machine>
         <machine compiler="gnu" testtype="acme_integration">wolf</machine>
         <machine compiler="intel" testtype="acme_integration">wolf</machine>
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
@@ -1259,9 +1301,7 @@
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
       </test>
-    </grid>
-    <grid name="f19_g16">
-      <test name="ERB">
+      <test name="ERH">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -1293,7 +1333,6 @@
         <machine compiler="intel" testtype="acme_integration">skybridge</machine>
         <machine compiler="intel" testtype="acme_integration">titan</machine>
         <machine compiler="pgi" testtype="acme_integration">titan</machine>
-        <machine compiler="pgi" testtype="aux_cam">titan</machine>
         <machine compiler="gnu" testtype="acme_integration">wolf</machine>
         <machine compiler="intel" testtype="acme_integration">wolf</machine>
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
@@ -1302,51 +1341,82 @@
         <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
         <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
       </test>
-      <test name="ERH">
-        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
-      </test>
       <test name="ERS">
+        <machine compiler="gnu" testtype="acme_developer">blues</machine>
+        <machine compiler="intel" testtype="acme_developer">blues</machine>
+        <machine compiler="pgi" testtype="acme_developer">blues</machine>
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
+        <machine compiler="pgi" testtype="acme_developer">bluewaters</machine>
         <machine compiler="pgi" testtype="acme_integration">bluewaters</machine>
+        <machine compiler="intel" testtype="acme_developer">cascade</machine>
+        <machine compiler="nag" testtype="acme_developer">cascade</machine>
         <machine compiler="intel" testtype="acme_integration">cascade</machine>
         <machine compiler="nag" testtype="acme_integration">cascade</machine>
+        <machine compiler="ibm" testtype="acme_developer">cetus</machine>
         <machine compiler="ibm" testtype="acme_integration">cetus</machine>
+        <machine compiler="pgi" testtype="acme_developer">eastwind</machine>
         <machine compiler="pgi" testtype="acme_integration">eastwind</machine>
+        <machine compiler="intel" testtype="acme_developer">edison</machine>
         <machine compiler="intel" testtype="acme_integration">edison</machine>
+        <machine compiler="intel" testtype="acme_developer">eos</machine>
         <machine compiler="intel" testtype="acme_integration">eos</machine>
+        <machine compiler="intel" testtype="acme_developer">evergreen</machine>
         <machine compiler="intel" testtype="acme_integration">evergreen</machine>
+        <machine compiler="intel" testtype="acme_developer">goldbach</machine>
+        <machine compiler="nag" testtype="acme_developer">goldbach</machine>
+        <machine compiler="pgi" testtype="acme_developer">goldbach</machine>
         <machine compiler="intel" testtype="acme_integration">goldbach</machine>
         <machine compiler="nag" testtype="acme_integration">goldbach</machine>
         <machine compiler="pgi" testtype="acme_integration">goldbach</machine>
+        <machine compiler="gnu" testtype="acme_developer">hopper</machine>
+        <machine compiler="intel" testtype="acme_developer">hopper</machine>
+        <machine compiler="pgi" testtype="acme_developer">hopper</machine>
         <machine compiler="gnu" testtype="acme_integration">hopper</machine>
         <machine compiler="intel" testtype="acme_integration">hopper</machine>
         <machine compiler="pgi" testtype="acme_integration">hopper</machine>
+        <machine compiler="intel" testtype="acme_developer">janus</machine>
         <machine compiler="intel" testtype="acme_integration">janus</machine>
+        <machine compiler="intel" testtype="acme_developer">lawrencium-lr2</machine>
         <machine compiler="intel" testtype="acme_integration">lawrencium-lr2</machine>
+        <machine compiler="gnu" testtype="acme_developer">linux-generic</machine>
         <machine compiler="gnu" testtype="acme_integration">linux-generic</machine>
+        <machine compiler="gnu" testtype="acme_developer">mac</machine>
         <machine compiler="gnu" testtype="acme_integration">mac</machine>
+        <machine compiler="gnu" testtype="acme_developer">melvin</machine>
         <machine compiler="gnu" testtype="acme_integration">melvin</machine>
+        <machine compiler="ibm" testtype="acme_developer">mira</machine>
         <machine compiler="ibm" testtype="acme_integration">mira</machine>
+        <machine compiler="gnu" testtype="acme_developer">mustang</machine>
+        <machine compiler="intel" testtype="acme_developer">mustang</machine>
         <machine compiler="gnu" testtype="acme_integration">mustang</machine>
         <machine compiler="intel" testtype="acme_integration">mustang</machine>
+        <machine compiler="pgi" testtype="acme_developer">olympus</machine>
         <machine compiler="pgi" testtype="acme_integration">olympus</machine>
+        <machine compiler="gnu" testtype="acme_developer">penn</machine>
         <machine compiler="gnu" testtype="acme_integration">penn</machine>
+        <machine compiler="intel" testtype="acme_developer">redsky</machine>
         <machine compiler="intel" testtype="acme_integration">redsky</machine>
+        <machine compiler="intel" testtype="acme_developer">skybridge</machine>
         <machine compiler="intel" testtype="acme_integration">skybridge</machine>
+        <machine compiler="intel" testtype="acme_developer">titan</machine>
+        <machine compiler="pgi" testtype="acme_developer">titan</machine>
         <machine compiler="intel" testtype="acme_integration">titan</machine>
         <machine compiler="pgi" testtype="acme_integration">titan</machine>
-        <machine compiler="pgi" testtype="aux_cam">titan</machine>
+        <machine compiler="gnu" testtype="acme_developer">wolf</machine>
+        <machine compiler="intel" testtype="acme_developer">wolf</machine>
         <machine compiler="gnu" testtype="acme_integration">wolf</machine>
         <machine compiler="intel" testtype="acme_integration">wolf</machine>
+        <machine compiler="gnu" testtype="acme_developer">yellowstone</machine>
+        <machine compiler="intel" testtype="acme_developer">yellowstone</machine>
+        <machine compiler="pgi" testtype="acme_developer">yellowstone</machine>
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="acme_integration">yellowstone</machine>
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
-        <machine compiler="intel" testtype="aux_science">yellowstone</machine>
       </test>
-      <test name="ERT">
+      <test name="ERS_D">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -1378,7 +1448,6 @@
         <machine compiler="intel" testtype="acme_integration">skybridge</machine>
         <machine compiler="intel" testtype="acme_integration">titan</machine>
         <machine compiler="pgi" testtype="acme_integration">titan</machine>
-        <machine compiler="pgi" testtype="aux_cam">titan</machine>
         <machine compiler="gnu" testtype="acme_integration">wolf</machine>
         <machine compiler="intel" testtype="acme_integration">wolf</machine>
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
@@ -1388,25 +1457,9 @@
         <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
       </test>
       <test name="PET_PT">
-        <machine compiler="pgi" testtype="prebeta">bluewaters</machine>
-        <machine compiler="intel" testtype="prebeta">edison</machine>
-        <machine compiler="intel" testtype="prebeta">eos</machine>
-        <machine compiler="pgi" testtype="prebeta">hopper</machine>
-        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
-        <machine compiler="intel" testtype="prebeta">lawrencium-lr2</machine>
-        <machine compiler="pgi" testtype="prebeta">titan</machine>
-        <machine compiler="pgi" testtype="prerelease">titan</machine>
-      </test>
-      <test name="SMS_D">
-        <machine compiler="pgi" testtype="prerelease">hopper</machine>
-        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
-      </test>
-      <test name="SMS_DE">
-        <machine compiler="intel" testtype="aux_esmf">yellowstone</machine>
+        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
       </test>
-    </grid>
-    <grid name="f45_g37">
-      <test name="ERB">
+      <test name="SEQ_PFC">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -1445,7 +1498,25 @@
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
       </test>
-      <test name="ERH">
+    </grid>
+    <grid name="ne120_g16">
+      <test name="ERS_Ld7">
+        <machine compiler="pgi" testtype="prerelease">hopper</machine>
+        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
+        <machine compiler="intel" testtype="prebeta">redsky</machine>
+        <machine compiler="pgi" testtype="prerelease">titan</machine>
+        <machine compiler="gnu" testtype="prebeta">yellowstone</machine>
+        <machine compiler="intel" testtype="prebeta">yellowstone</machine>
+        <machine compiler="pgi" testtype="prebeta">yellowstone</machine>
+      </test>
+    </grid>
+    <grid name="ne120_t12">
+      <test name="SBN">
+        <machine compiler="null" testtype="null">null</machine>
+      </test>
+    </grid>
+    <grid name="ne16_g37">
+      <test name="ERB">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -1482,85 +1553,46 @@
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="acme_integration">yellowstone</machine>
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
-        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
-        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
       </test>
       <test name="ERS">
-        <machine compiler="gnu" testtype="acme_developer">blues</machine>
-        <machine compiler="intel" testtype="acme_developer">blues</machine>
-        <machine compiler="pgi" testtype="acme_developer">blues</machine>
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
-        <machine compiler="pgi" testtype="acme_developer">bluewaters</machine>
         <machine compiler="pgi" testtype="acme_integration">bluewaters</machine>
-        <machine compiler="intel" testtype="acme_developer">cascade</machine>
-        <machine compiler="nag" testtype="acme_developer">cascade</machine>
         <machine compiler="intel" testtype="acme_integration">cascade</machine>
         <machine compiler="nag" testtype="acme_integration">cascade</machine>
-        <machine compiler="ibm" testtype="acme_developer">cetus</machine>
         <machine compiler="ibm" testtype="acme_integration">cetus</machine>
-        <machine compiler="pgi" testtype="acme_developer">eastwind</machine>
         <machine compiler="pgi" testtype="acme_integration">eastwind</machine>
-        <machine compiler="intel" testtype="acme_developer">edison</machine>
         <machine compiler="intel" testtype="acme_integration">edison</machine>
-        <machine compiler="intel" testtype="acme_developer">eos</machine>
         <machine compiler="intel" testtype="acme_integration">eos</machine>
-        <machine compiler="intel" testtype="acme_developer">evergreen</machine>
         <machine compiler="intel" testtype="acme_integration">evergreen</machine>
-        <machine compiler="intel" testtype="acme_developer">goldbach</machine>
-        <machine compiler="nag" testtype="acme_developer">goldbach</machine>
-        <machine compiler="pgi" testtype="acme_developer">goldbach</machine>
         <machine compiler="intel" testtype="acme_integration">goldbach</machine>
         <machine compiler="nag" testtype="acme_integration">goldbach</machine>
         <machine compiler="pgi" testtype="acme_integration">goldbach</machine>
-        <machine compiler="gnu" testtype="acme_developer">hopper</machine>
-        <machine compiler="intel" testtype="acme_developer">hopper</machine>
-        <machine compiler="pgi" testtype="acme_developer">hopper</machine>
         <machine compiler="gnu" testtype="acme_integration">hopper</machine>
         <machine compiler="intel" testtype="acme_integration">hopper</machine>
         <machine compiler="pgi" testtype="acme_integration">hopper</machine>
-        <machine compiler="intel" testtype="acme_developer">janus</machine>
         <machine compiler="intel" testtype="acme_integration">janus</machine>
-        <machine compiler="intel" testtype="acme_developer">lawrencium-lr2</machine>
         <machine compiler="intel" testtype="acme_integration">lawrencium-lr2</machine>
-        <machine compiler="gnu" testtype="acme_developer">linux-generic</machine>
         <machine compiler="gnu" testtype="acme_integration">linux-generic</machine>
-        <machine compiler="gnu" testtype="acme_developer">mac</machine>
         <machine compiler="gnu" testtype="acme_integration">mac</machine>
-        <machine compiler="gnu" testtype="acme_developer">melvin</machine>
         <machine compiler="gnu" testtype="acme_integration">melvin</machine>
-        <machine compiler="ibm" testtype="acme_developer">mira</machine>
         <machine compiler="ibm" testtype="acme_integration">mira</machine>
-        <machine compiler="gnu" testtype="acme_developer">mustang</machine>
-        <machine compiler="intel" testtype="acme_developer">mustang</machine>
         <machine compiler="gnu" testtype="acme_integration">mustang</machine>
         <machine compiler="intel" testtype="acme_integration">mustang</machine>
-        <machine compiler="pgi" testtype="acme_developer">olympus</machine>
         <machine compiler="pgi" testtype="acme_integration">olympus</machine>
-        <machine compiler="gnu" testtype="acme_developer">penn</machine>
         <machine compiler="gnu" testtype="acme_integration">penn</machine>
-        <machine compiler="intel" testtype="acme_developer">redsky</machine>
         <machine compiler="intel" testtype="acme_integration">redsky</machine>
-        <machine compiler="intel" testtype="acme_developer">skybridge</machine>
         <machine compiler="intel" testtype="acme_integration">skybridge</machine>
-        <machine compiler="intel" testtype="acme_developer">titan</machine>
-        <machine compiler="pgi" testtype="acme_developer">titan</machine>
         <machine compiler="intel" testtype="acme_integration">titan</machine>
         <machine compiler="pgi" testtype="acme_integration">titan</machine>
-        <machine compiler="gnu" testtype="acme_developer">wolf</machine>
-        <machine compiler="intel" testtype="acme_developer">wolf</machine>
         <machine compiler="gnu" testtype="acme_integration">wolf</machine>
         <machine compiler="intel" testtype="acme_integration">wolf</machine>
-        <machine compiler="gnu" testtype="acme_developer">yellowstone</machine>
-        <machine compiler="intel" testtype="acme_developer">yellowstone</machine>
-        <machine compiler="pgi" testtype="acme_developer">yellowstone</machine>
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="acme_integration">yellowstone</machine>
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
-        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
       </test>
-      <test name="ERS_D">
+      <test name="ERT">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -1597,13 +1629,10 @@
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="acme_integration">yellowstone</machine>
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
-        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
-        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
-      </test>
-      <test name="PET_PT">
-        <machine compiler="intel" testtype="aux_cice">yellowstone</machine>
       </test>
-      <test name="SEQ_PFC">
+    </grid>
+    <grid name="ne30_g16">
+      <test name="ERS">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -1640,23 +1669,6 @@
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="acme_integration">yellowstone</machine>
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
-        <machine compiler="intel" testtype="aux_cam">yellowstone</machine>
-      </test>
-    </grid>
-    <grid name="ne120_g16">
-      <test name="ERS_Ld7">
-        <machine compiler="pgi" testtype="prerelease">hopper</machine>
-        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
-        <machine compiler="intel" testtype="prebeta">redsky</machine>
-        <machine compiler="pgi" testtype="prerelease">titan</machine>
-        <machine compiler="gnu" testtype="prebeta">yellowstone</machine>
-        <machine compiler="intel" testtype="prebeta">yellowstone</machine>
-        <machine compiler="pgi" testtype="prebeta">yellowstone</machine>
-      </test>
-    </grid>
-    <grid name="ne120_t12">
-      <test name="SBN">
-        <machine compiler="null" testtype="null">null</machine>
       </test>
     </grid>
   </compset>
@@ -3471,6 +3483,37 @@
         <machine compiler="intel" testtype="csltiming">yellowstone</machine>
       </test>
       <test name="SMS_D_Ld3">
+        <machine compiler="pgi" testtype="prerelease">hopper</machine>
+        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
+        <machine compiler="intel" testtype="prebeta">janus</machine>
+        <machine compiler="intel" testtype="prebeta">redsky</machine>
+        <machine compiler="gnu" testtype="prebeta">yellowstone</machine>
+        <machine compiler="intel" testtype="prebeta">yellowstone</machine>
+        <machine compiler="pgi" testtype="prebeta">yellowstone</machine>
+      </test>
+    </grid>
+    <grid name="f19_g16">
+      <test name="ERS_Ld3">
+        <machine compiler="intel" testtype="prebeta">goldbach</machine>
+        <machine compiler="pgi" testtype="prebeta">goldbach</machine>
+        <machine compiler="intel" testtype="prealpha">janus</machine>
+        <machine compiler="intel" testtype="prebeta">janus</machine>
+        <machine compiler="intel" testtype="prebeta">redsky</machine>
+        <machine compiler="gnu" testtype="prealpha">yellowstone</machine>
+        <machine compiler="intel" testtype="prealpha">yellowstone</machine>
+        <machine compiler="pgi" testtype="prealpha">yellowstone</machine>
+        <machine compiler="gnu" testtype="prebeta">yellowstone</machine>
+        <machine compiler="intel" testtype="prebeta">yellowstone</machine>
+        <machine compiler="pgi" testtype="prebeta">yellowstone</machine>
+      </test>
+    </grid>
+    <grid name="ne120_ne120">
+      <test name="PFS">
+        <machine compiler="intel" testtype="csltiming">yellowstone</machine>
+      </test>
+    </grid>
+    <grid name="ne16_g37">
+      <test name="ERS_Ld3">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -3488,10 +3531,7 @@
         <machine compiler="gnu" testtype="acme_integration">hopper</machine>
         <machine compiler="intel" testtype="acme_integration">hopper</machine>
         <machine compiler="pgi" testtype="acme_integration">hopper</machine>
-        <machine compiler="pgi" testtype="prerelease">hopper</machine>
-        <machine compiler="ibm" testtype="prerelease">intrepid</machine>
         <machine compiler="intel" testtype="acme_integration">janus</machine>
-        <machine compiler="intel" testtype="prebeta">janus</machine>
         <machine compiler="intel" testtype="acme_integration">lawrencium-lr2</machine>
         <machine compiler="gnu" testtype="acme_integration">linux-generic</machine>
         <machine compiler="gnu" testtype="acme_integration">mac</machine>
@@ -3502,7 +3542,6 @@
         <machine compiler="pgi" testtype="acme_integration">olympus</machine>
         <machine compiler="gnu" testtype="acme_integration">penn</machine>
         <machine compiler="intel" testtype="acme_integration">redsky</machine>
-        <machine compiler="intel" testtype="prebeta">redsky</machine>
         <machine compiler="intel" testtype="acme_integration">skybridge</machine>
         <machine compiler="intel" testtype="acme_integration">titan</machine>
         <machine compiler="pgi" testtype="acme_integration">titan</machine>
@@ -3511,13 +3550,10 @@
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="acme_integration">yellowstone</machine>
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
-        <machine compiler="gnu" testtype="prebeta">yellowstone</machine>
-        <machine compiler="intel" testtype="prebeta">yellowstone</machine>
-        <machine compiler="pgi" testtype="prebeta">yellowstone</machine>
       </test>
     </grid>
-    <grid name="f19_g16">
-      <test name="ERS_Ld3">
+    <grid name="ne16_ne16">
+      <test name="SMS_D_Ld3">
         <machine compiler="gnu" testtype="acme_integration">blues</machine>
         <machine compiler="intel" testtype="acme_integration">blues</machine>
         <machine compiler="pgi" testtype="acme_integration">blues</machine>
@@ -3532,14 +3568,10 @@
         <machine compiler="intel" testtype="acme_integration">goldbach</machine>
         <machine compiler="nag" testtype="acme_integration">goldbach</machine>
         <machine compiler="pgi" testtype="acme_integration">goldbach</machine>
-        <machine compiler="intel" testtype="prebeta">goldbach</machine>
-        <machine compiler="pgi" testtype="prebeta">goldbach</machine>
         <machine compiler="gnu" testtype="acme_integration">hopper</machine>
         <machine compiler="intel" testtype="acme_integration">hopper</machine>
         <machine compiler="pgi" testtype="acme_integration">hopper</machine>
         <machine compiler="intel" testtype="acme_integration">janus</machine>
-        <machine compiler="intel" testtype="prealpha">janus</machine>
-        <machine compiler="intel" testtype="prebeta">janus</machine>
         <machine compiler="intel" testtype="acme_integration">lawrencium-lr2</machine>
         <machine compiler="gnu" testtype="acme_integration">linux-generic</machine>
         <machine compiler="gnu" testtype="acme_integration">mac</machine>
@@ -3550,7 +3582,6 @@
         <machine compiler="pgi" testtype="acme_integration">olympus</machine>
         <machine compiler="gnu" testtype="acme_integration">penn</machine>
         <machine compiler="intel" testtype="acme_integration">redsky</machine>
-        <machine compiler="intel" testtype="prebeta">redsky</machine>
         <machine compiler="intel" testtype="acme_integration">skybridge</machine>
         <machine compiler="intel" testtype="acme_integration">titan</machine>
         <machine compiler="pgi" testtype="acme_integration">titan</machine>
@@ -3559,17 +3590,6 @@
         <machine compiler="gnu" testtype="acme_integration">yellowstone</machine>
         <machine compiler="intel" testtype="acme_integration">yellowstone</machine>
         <machine compiler="pgi" testtype="acme_integration">yellowstone</machine>
-        <machine compiler="gnu" testtype="prealpha">yellowstone</machine>
-        <machine compiler="intel" testtype="prealpha">yellowstone</machine>
-        <machine compiler="pgi" testtype="prealpha">yellowstone</machine>
-        <machine compiler="gnu" testtype="prebeta">yellowstone</machine>
-        <machine compiler="intel" testtype="prebeta">yellowstone</machine>
-        <machine compiler="pgi" testtype="prebeta">yellowstone</machine>
-      </test>
-    </grid>
-    <grid name="ne120_ne120">
-      <test name="PFS">
-        <machine compiler="intel" testtype="csltiming">yellowstone</machine>
       </test>
     </grid>
     <grid name="ne30_ne30">