Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -ra7c835d472b40db40593e49d7f66a62068226bb4 -radde281467e093774f5fa84419a1476b5b2bf52c
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision a7c835d472b40db40593e49d7f66a62068226bb4)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision adde281467e093774f5fa84419a1476b5b2bf52c)
@@ -397,6 +397,20 @@
 
 /*********************************************************************//**
  * @brief
+ * The zeroBloodLeakReset function resets the commandRqstCount for all the
+ * zero blood leak commands.
+ * @return none
+ *************************************************************************/
+void zeroBloodLeakReset( void )
+{
+    resetEmbModeCmdRqstCount( Z_EMB_MODE_CMD );
+    resetEmbModeCmdRqstCount( G_EMB_MODE_CMD );
+    resetEmbModeCmdRqstCount( Q_EMB_MODE_CMD );
+    resetEmbModeCmdRqstCount( T_EMB_MODE_CMD );
+}
+
+/*********************************************************************//**
+ * @brief
  * The hasBloodLeakZeroSequenceFailed function returns TURE if the number
  * of times the zero sequence has failed.
  * @details Inputs: bloodLeakEmbModeCmd
@@ -637,10 +651,7 @@
         if ( FALSE == hasCmdSqncFailed )
         {
             // Done with zero sequence, transition to other states
-            resetEmbModeCmdRqstCount( Z_EMB_MODE_CMD );
-            resetEmbModeCmdRqstCount( G_EMB_MODE_CMD );
-            resetEmbModeCmdRqstCount( Q_EMB_MODE_CMD );
-            resetEmbModeCmdRqstCount( T_EMB_MODE_CMD );
+            zeroBloodLeakReset();
             bloodLeakSelfTestStatus = SELF_TEST_STATUS_PASSED;
             state                   = BLOOD_LEAK_NORMAL_STATE;
         }
Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -r57f9f2d3b4c109c952034003c77a315bb3c41717 -radde281467e093774f5fa84419a1476b5b2bf52c
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 57f9f2d3b4c109c952034003c77a315bb3c41717)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision adde281467e093774f5fa84419a1476b5b2bf52c)
@@ -56,6 +56,7 @@
 void execBloodLeak( void );
 void execBloodLeakEmbModeCommand( void );
 BOOL zeroBloodLeak( void );
+void zeroBloodLeakReset (void );
 BOOL hasBloodLeakZeroSequenceFailed( void );
 
 void exitBloodLeakNormalState( void );
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rd4fb7fbaefda4e6616013778edeb2cc8ebba0d1c -radde281467e093774f5fa84419a1476b5b2bf52c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d4fb7fbaefda4e6616013778edeb2cc8ebba0d1c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision adde281467e093774f5fa84419a1476b5b2bf52c)
@@ -1854,6 +1854,7 @@
     {
         if ( TRUE == hasBloodLeakZeroSequenceFailed() )
         {
+            zeroBloodLeakReset();
 #ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif