Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r9f04920d50500b59778222eb7a1b082e56c171c6 -r8dc2d20bdd7670a7570eb88f4f28187f3434eb19
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9f04920d50500b59778222eb7a1b082e56c171c6)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8dc2d20bdd7670a7570eb88f4f28187f3434eb19)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      08-Mar-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      24-Mar-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -360,7 +360,7 @@
 
             data.timeout   = MAX_NO_CARTRIDGE_SELF_TEST_TIME;
             data.countdown = ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
+            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
         }
         else
         {
@@ -518,7 +518,7 @@
 
         data.timeout   = MAX_DRY_SELF_TEST_TIME;
         data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-        broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
+        broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
     }
 }
 
@@ -917,6 +917,9 @@
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
             {
+                signalAllowDGFlushFills();
+                signalAllowDGFillRes1();
+                signalAllowDGFillRes2();
                 state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
             }
             else
@@ -1483,14 +1486,6 @@
                 {
                     state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
                     syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
-#ifndef _RELEASE_
-                    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )  // if no air pump, now we can allow fills to start
-                    {
-                        signalAllowDGFlushFills();
-                        signalAllowDGFillRes1();
-                        signalAllowDGFillRes2();
-                    }
-#endif
                 }
                 else
                 {
@@ -1512,15 +1507,6 @@
     }
     else
     {
-#ifndef _RELEASE_
-        if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) ) ||         // if no air pump, now we can allow fills to start
-             ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) ) )    // OR if Dry tests disabled
-        {
-            signalAllowDGFlushFills();
-            signalAllowDGFillRes1();
-            signalAllowDGFillRes2();
-        }
-#endif
         state = DRY_SELF_TESTS_COMPLETE_STATE;
     }
 
@@ -1530,6 +1516,19 @@
         setupForSelfTestsStop();
     }
 
+#ifndef _RELEASE_
+    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) ) ||  // Allow res 1&2 fills now if air pump not disabled
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) ) )
+    {
+        if ( state != DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE )
+        {
+            signalAllowDGFlushFills();
+            signalAllowDGFillRes1();
+            signalAllowDGFillRes2();
+        }
+    }
+#endif
+
     return state;
 }