Index: firmware/App/Controllers/AlarmAudio.h
===================================================================
diff -u -r9d755b0734315e11c8fef5768815697d3bd50287 -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a
--- firmware/App/Controllers/AlarmAudio.h	(.../AlarmAudio.h)	(revision 9d755b0734315e11c8fef5768815697d3bd50287)
+++ firmware/App/Controllers/AlarmAudio.h	(.../AlarmAudio.h)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
@@ -19,9 +19,10 @@
 #define __ALARM_AUDIO_H__
 
 #include "TDCommon.h"
+#include "MessageSupport.h"
 
 /**
- *  @defgroup AlarmAudio AlarmLamp
+ *  @defgroup AlarmAudio AlarmAudio
  *  @brief The Alarm Audio unit controls the audio for the alarm system.
  *  Provides functions for requesting alarm audio patterns and testing the
  *  alarm audio.
@@ -45,22 +46,19 @@
 void setAlarmAudioVolume( U32 volumeLevel );
 
 U32 getAlarmAudioVolume( void );
+
 F32 getAlarmAudioPrimaryHighGainCurrent( void );
 F32 getAlarmAudioPrimaryLowGainCurrent( void );
 F32 getAlarmAudioBackupCurrent( void );
 
 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