Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rd62cad9611841e592b4b46b1170e4beb57c1d153 -r4fa0828e455e7701dc485b00391486bdfc8d7775
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d62cad9611841e592b4b46b1170e4beb57c1d153)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4fa0828e455e7701dc485b00391486bdfc8d7775)
@@ -7,7 +7,7 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Sean Nash
+* @author  (last)      Michael Garthwaite
 * @date    (last)      08-Mar-2023
 *
 * @author  (original)  Quang Nguyen
@@ -363,7 +363,7 @@
         }
         else
         {
-//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -916,6 +916,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
@@ -1482,14 +1485,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
                 {
@@ -1511,14 +1506,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
-        {
-            signalAllowDGFlushFills();
-            signalAllowDGFillRes1();
-            signalAllowDGFillRes2();
-        }
-#endif
         state = DRY_SELF_TESTS_COMPLETE_STATE;
     }
 
@@ -1528,6 +1515,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;
 }