Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r97f231b6122d5c6d1215625bb3c3fa77f75ca0d8 -rb2afbf7b9bb007d06c28a56cd4e61d3cd9bbe150
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 97f231b6122d5c6d1215625bb3c3fa77f75ca0d8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b2afbf7b9bb007d06c28a56cd4e61d3cd9bbe150)
@@ -4295,14 +4295,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetBloodLeakDataOverrideRequest function handles a request to
- * override the blood leak detector data.
+ * The handleSetBloodLeakStatusOverrideRequest function handles a request to
+ * override the blood leak detector status.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleSetBloodLeakDataOverrideRequest( MESSAGE_T *message )
+void handleSetBloodLeakStatusOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -4313,11 +4313,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBloodLeakDataOverride( ( BLOOD_LEAK_STATUS_T)( payload.state.u32 ), ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) );
+            result = testSetBloodLeakStatusOverride( (BLOOD_LEAK_STATUS_T)( payload.state.u32 ) );
         }
         else
         {
-            result = testResetBloodLeakDataOverride();
+            result = testResetBloodLeakStatusOverride();
         }
     }
 
@@ -4327,6 +4327,38 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetBloodLeakStateOverrideRequest function handles a request to
+ * override the blood leak detector state.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetBloodLeakStateOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBloodLeakStateOverride( (BLOOD_LEAK_STATES_T)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetBloodLeakStateOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleHDSoftwareResetRequest function handles a request to reset the
  * HD firmware processor.
  * @details Inputs: none