Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1d07de4e970f54f2ae1786ef546cf5567df9ba8e -r81e9ee9140164f6097e84a68f8b2b0c1cd82ba91
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1d07de4e970f54f2ae1786ef546cf5567df9ba8e)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 81e9ee9140164f6097e84a68f8b2b0c1cd82ba91)
@@ -27,6 +27,7 @@
 #include "ModeTreatmentParams.h"
 #include "PresOccl.h"
 #include "SelfTests.h"
+#include "Switches.h"
 #include "SyringePump.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -133,6 +134,7 @@
 
 static void resetSelfTestsFlags( void );
 static void setupForSelfTestsStop( void );
+static void setAlarmResumePerDoorAndLatch( void );
 
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestsWaitForClosedDoor( void );
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestHomeValvesState( void );
@@ -241,6 +243,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The setAlarmResumePerDoorAndLatch function sets alarm resume enable for
+ * stop states based on whether door and pump track are closed.
+ * @details Inputs: state of front door and pump track
+ * @details Outputs: resume alarm enabled/disabled
+ * @return none
+ *************************************************************************/
+static void setAlarmResumePerDoorAndLatch( void )
+{
+    BOOL doorClosed  = ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ? TRUE : FALSE );
+    BOOL latchClosed = ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ? TRUE : FALSE );
+
+    // require front door and pump track to be closed before allowing resume
+    if ( ( TRUE == doorClosed ) && ( TRUE == latchClosed ) )
+    {
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
+    }
+    else
+    {
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The transitionToNoCartSelfTests function resets anything required before
  * the start of no cartridge self-tests.
  * @details Inputs: none
@@ -517,7 +543,7 @@
         selfTestPreviousPublishDataTime = getMSTimerCount();
 
         data.timeout   = MAX_DRY_SELF_TEST_TIME;
-        data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
+        data.countdown = ( elapsedSelfTestTimeInSecs <= MAX_DRY_SELF_TEST_TIME ? ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs ) : 0 );
         broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
     }
 }
@@ -877,6 +903,7 @@
 {
     NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_STOPPED_STATE;
 
+    setAlarmResumePerDoorAndLatch();
     doorClosedRequired( FALSE, FALSE );
 
     // Restart self-test start time
@@ -1574,6 +1601,7 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_STOPPED_STATE;
 
+    setAlarmResumePerDoorAndLatch();
     doorClosedRequired( FALSE, FALSE );
 
     // if not enough heparin alarm, pre-load pusher after retract completes
@@ -2081,6 +2109,7 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_STOPPED_STATE;
 
+    setAlarmResumePerDoorAndLatch();
     doorClosedRequired( FALSE, FALSE );
 
     if ( TRUE == selfTestsResumeRequested )