Index: firmware/App/Controllers/AlarmAudio.h
===================================================================
diff -u -rabba5986eed8c2f702ca1ed70afd735a7f31db2a -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a
--- firmware/App/Controllers/AlarmAudio.h	(.../AlarmAudio.h)	(revision abba5986eed8c2f702ca1ed70afd735a7f31db2a)
+++ firmware/App/Controllers/AlarmAudio.h	(.../AlarmAudio.h)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
@@ -19,6 +19,7 @@
 #define __ALARM_AUDIO_H__
 
 #include "TDCommon.h"
+#include "MessageSupport.h"
 
 /**
  *  @defgroup AlarmAudio AlarmAudio
@@ -53,15 +54,11 @@
 SELF_TEST_STATUS_T execAlarmAudioSelfTest( void );
 void resetAlarmAudioPOSTState( void );
 
-BOOL testSetAlarmAudioVolumeLevelOverride( U32 volume );
-BOOL testResetAlarmAudioVolumeLevelOverride( void );
-BOOL testSetPrimaryAlarmAudioCurrentHGOverride( F32 mA );
-BOOL testResetPrimaryAlarmAudioCurrentHGOverride( void );
-BOOL testSetPrimaryAlarmAudioCurrentLGOverride( F32 mA );
-BOOL testResetPrimaryAlarmAudioCurrentLGOverride( void );
-BOOL testSetBackupAlarmAudioCurrentOverride( F32 mA );
-BOOL testResetBackupAlarmAudioCurrentOverride( void );
-
+BOOL testAlarmAudioVolumeLevelOverride( MESSAGE_T *message );
+BOOL testPrimaryAlarmAudioCurrentHGOverride( MESSAGE_T *message );
+BOOL testPrimaryAlarmAudioCurrentLGOverride( MESSAGE_T *message );
+BOOL testBackupAlarmAudioCurrentOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif