Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -re3c5eb0fcb29840433e2c46086146ae683533104 -rb2afbf7b9bb007d06c28a56cd4e61d3cd9bbe150
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision e3c5eb0fcb29840433e2c46086146ae683533104)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision b2afbf7b9bb007d06c28a56cd4e61d3cd9bbe150)
@@ -282,27 +282,25 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetBloodLeakDataOverride function overrides the data
+ * The testSetBloodLeakStatusOverride function overrides the status
  * of the blood leak detector.
  * @details Inputs: none
- * @details Outputs: bloodLeakStatus, bloodLeakState
+ * @details Outputs: bloodLeakStatus
  * @param none
- * @param data override blood leak detector with this
+ * @param status override blood leak detector with this
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetBloodLeakDataOverride( BLOOD_LEAK_STATUS_T status, BLOOD_LEAK_STATES_T state )
+BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATUS_T status )
 {
     BOOL result = FALSE;
 
-    if ( ( status < NUM_OF_BLOOD_LEAK_STATUS ) && ( state < NUM_OF_BLOOD_LEAK_STATES ) )
+    if ( status < NUM_OF_BLOOD_LEAK_STATUS )
     {
         if ( TRUE == isTestingActivated() )
         {
             result = TRUE;
             bloodLeakStatus.ovData = (U32)status;
             bloodLeakStatus.override = OVERRIDE_KEY;
-            bloodLeakState.ovData = (U32)state;
-            bloodLeakState.override = OVERRIDE_KEY;
         }
     }
 
@@ -311,14 +309,14 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetBloodLeakDataOverride function resets the override of the
- * blood leak detector data.
+ * The testResetBloodLeakStatusOverride function resets the override of the
+ * blood leak detector status.
  * @details Inputs: none
- * @details Outputs: bloodLeakStatus, bloodLeakState
+ * @details Outputs: bloodLeakStatus
  * @param none
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
-BOOL testResetBloodLeakDataOverride( void )
+BOOL testResetBloodLeakStatusOverride( void )
 {
     BOOL result = FALSE;
 
@@ -327,6 +325,54 @@
         result = TRUE;
         bloodLeakStatus.override = OVERRIDE_RESET;
         bloodLeakStatus.ovData = bloodLeakStatus.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testSetBloodLeakStateOverride function overrides the state
+ * of the blood leak detector.
+ * @details Inputs: none
+ * @details Outputs: bloodLeakState
+ * @param none
+ * @param state override blood leak detector with this
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATES_T state )
+{
+    BOOL result = FALSE;
+
+    if ( state < NUM_OF_BLOOD_LEAK_STATES )
+    {
+        if ( TRUE == isTestingActivated() )
+        {
+            result = TRUE;
+            bloodLeakState.ovData = (U32)state;
+            bloodLeakState.override = OVERRIDE_KEY;
+        }
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetBloodLeakStateOverride function resets the override of the
+ * blood leak detector state.
+ * @details Inputs: none
+ * @details Outputs: bloodLeakState
+ * @param none
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetBloodLeakStateOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
         bloodLeakState.override = OVERRIDE_RESET;
         bloodLeakState.ovData = bloodLeakState.ovInitData;
     }