Index: firmware/App/Monitors/BloodLeak.h
===================================================================
diff -u -rbc4537c14a446c8fe1720f574200399b180a6ff9 -r208d9299339c3b89ac7fbd2100eef3aa121bf591
--- firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision bc4537c14a446c8fe1720f574200399b180a6ff9)
+++ firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision 208d9299339c3b89ac7fbd2100eef3aa121bf591)
@@ -55,28 +55,17 @@
 void exitBloodLeakNormalState( void );
 
 SELF_TEST_STATUS_T execBloodLeakSelfTest( void );
-
 BLOOD_LEAK_STATUS_T getBloodLeakStatus( void );
 SELF_TEST_STATUS_T getBloodLeakSelfTestStatus( void );
 
-BOOL testSetBloodLeakDataPublishIntervalOverride( U32 value );
-BOOL testResetBloodLeakDataPublishIntervalOverride( void );
+BOOL testBloodLeakDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testBloodLeakStatusOverride( MESSAGE_T *message );
+BOOL testSetBloodLeak2EmbeddedMode( MESSAGE_T *message );
+BOOL testSetBloodLeakEmbeddedModeCommand( MESSAGE_T *message );
+BOOL testBloodLeakEmbeddedModeInfoOverride( MESSAGE_T *message );
+BOOL testBloodLeakIntensityMovingAverageOverride( MESSAGE_T *message );
+BOOL testBloodLeakZeroingIntervalInMillisecondsOverride( MESSAGE_T *message );
 
-BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATUS_T status );
-BOOL testResetBloodLeakStatusOverride( void );
-
-BOOL testSetBloodLeak2EmbeddedMode( void );
-BOOL testSetBloodLeakEmbeddedModeCommand( U08 command, U16 setPointPayload );
-
-BOOL testSetBloodLeakEmbeddedModeInfoOverride( U08 command, U32 value );
-BOOL testResetBloodLeakEmbeddedModeInfoOverride( U08 command );
-
-BOOL testSetBloodLeakIntensityMovingAverageOverride( F32 value );
-BOOL testResetBloodLeakIntensityMovingAverageOverride( void );
-
-BOOL testSetBloodLeakZeroingIntervalInMinsOverride( BOOL upperRangeInterval, U32 valueMins );
-BOOL testResetBloodLeakZeroingIntervalInMinsOverride( BOOL upperRangeInterval );
-
 /**@}*/
 
 #endif