Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -r9690fa47c23a2d76f62f385b553db7e565e18a1e -rb8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 9690fa47c23a2d76f62f385b553db7e565e18a1e)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision b8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52)
@@ -33,26 +33,42 @@
 
 // ********** public definitions **********
 
-/// Enumeration of blood leak detector states.
-typedef enum BloodLeakDetectorStates
+/// Enumeration of blood leak detector status.
+typedef enum BloodLeakDetectorStatus
 {
     BLOOD_LEAK_DETECTED = 0,               ///< Blood leak detector senses blood
     BLOOD_LEAK_NOT_DETECTED,               ///< Blood leak detector does not sense any blood
-    NUM_OF_BLOOD_LEAK_STATES               ///< Number of blood leak detector states
-} BLOOD_LEAK_STATES_T;
+    NUM_OF_BLOOD_LEAK_STATUS               ///< Number of blood leak detector status
+} BLOOD_LEAK_STATUS_T;
+
+/// Defined states for the blood leak detector state machine.
+typedef enum BloodLeakStates
+{
+    BLOOD_LEAK_INIT_STATE = 0,              ///< Initial state
+    BLOOD_LEAK_ZERO_STATE,                  ///< Zero state
+    BLOOD_LEAK_SELF_TEST_STATE,             ///< Self-test state
+    BLOOD_LEAK_NORMAL_STATE,                ///< Normal state
+    NUM_OF_BLOOD_LEAK_STATES                ///< Number of blood leak detector states
+} BLOOD_LEAK_STATE_T;
 
 // ********** public function prototypes **********
 
 void initBloodLeak( void );
 void zeroBloodLeak( void );
+BOOL selfTestBloodLeak( void );
 void execBloodLeak( void );
 
-BLOOD_LEAK_STATES_T getBloodLeakStatus( void );
+BLOOD_LEAK_STATUS_T getBloodLeakStatus( void );
 
 BOOL testSetBloodLeakStatusPublishIntervalOverride( U32 value );
 BOOL testResetBloodLeakStatusPublishIntervalOverride( void );
-BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATES_T state );
+BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATUS_T state );
 BOOL testResetBloodLeakStatusOverride( void );
+
+BOOL testSetBloodLeakStatePublishIntervalOverride( U32 value );
+BOOL testResetBloodLeakStatePublishIntervalOverride( void );
+BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATE_T state );
+BOOL testResetBloodLeakStateOverride( void );
 
 /**@}*/