Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r59d52f24473a340bb553dda2f12d86c18cbd3664 -re11a13817641163361996836c7ca8441cdbced87
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 59d52f24473a340bb553dda2f12d86c18cbd3664)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision e11a13817641163361996836c7ca8441cdbced87)
@@ -1340,6 +1340,15 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetAlarmInfoPublishIntervalOverride function sets the override of the
+ * alarm information publication interval.
+ * @details Inputs: none
+ * @details Outputs: alarmInfoPublishInterval
+ * @param ms milliseconds between alarm info broadcasts
+ * @return TRUE if override set successful, FALSE if not
+ *************************************************************************/
 BOOL testSetAlarmInfoPublishIntervalOverride( U32 ms )
 {
     BOOL result = FALSE;
@@ -1356,6 +1365,14 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testResetAlarmInfoPublishIntervalOverride function resets the override of the
+ * alarm information publication interval.
+ * @details Inputs: none
+ * @details Outputs: alarmInfoPublishInterval
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
 BOOL testResetAlarmInfoPublishIntervalOverride( void )
 {
     BOOL result = FALSE;
@@ -1370,6 +1387,15 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetAlarmAudioVolumeLevelOverride function sets the override of the
+ * alarm audio volume.
+ * @details Inputs: none
+ * @details Outputs: alarmAudioVolumeLevel
+ * @param volume volume level (1..5) of alarm audio
+ * @return TRUE if override set successful, FALSE if not
+ *************************************************************************/
 BOOL testSetAlarmAudioVolumeLevelOverride( U32 volume )
 {
     BOOL result = FALSE;
@@ -1384,6 +1410,14 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testResetAlarmAudioVolumeLevelOverride function resets the override of the
+ * alarm audio volume.
+ * @details Inputs: none
+ * @details Outputs: alarmAudioVolumeLevel
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
 BOOL testResetAlarmAudioVolumeLevelOverride( void )
 {
     BOOL result = FALSE;
@@ -1398,20 +1432,37 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetPrimaryAlarmAudioCurrentHGOverride function sets the override of the
+ * alarm audio current (high gain) in mA.
+ * @details Inputs: none
+ * @details Outputs: alarmPrimaryAudioCurrentHG
+ * @param mA milliamps measured from high gain channel of primary alarm audio
+ * @return TRUE if override set successful, FALSE if not
+ *************************************************************************/
 BOOL testSetPrimaryAlarmAudioCurrentHGOverride( F32 mA )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        alarmPrimaryAudioCurrentHG.ovData = MAX_ALARM_VOLUME_LEVEL - mA;
+        alarmPrimaryAudioCurrentHG.ovData = mA;
         alarmPrimaryAudioCurrentHG.override = OVERRIDE_KEY;
     }
 
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testResetPrimaryAlarmAudioCurrentHGOverride function resets the override of the
+ * alarm audio current (high gain).
+ * @details Inputs: none
+ * @details Outputs: alarmPrimaryAudioCurrentHG
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
 BOOL testResetPrimaryAlarmAudioCurrentHGOverride( void )
 {
     BOOL result = FALSE;
@@ -1426,20 +1477,37 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetPrimaryAlarmAudioCurrentLGOverride function sets the override of the
+ * alarm audio current (low gain) in mA.
+ * @details Inputs: none
+ * @details Outputs: alarmPrimaryAudioCurrentLG
+ * @param mA milliamps measured from low gain channel of primary alarm audio
+ * @return TRUE if override set successful, FALSE if not
+ *************************************************************************/
 BOOL testSetPrimaryAlarmAudioCurrentLGOverride( F32 mA )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        alarmPrimaryAudioCurrentLG.ovData = MAX_ALARM_VOLUME_LEVEL - mA;
+        alarmPrimaryAudioCurrentLG.ovData = mA;
         alarmPrimaryAudioCurrentLG.override = OVERRIDE_KEY;
     }
 
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testResetPrimaryAlarmAudioCurrentLGOverride function resets the override of the
+ * alarm audio current (low gain).
+ * @details Inputs: none
+ * @details Outputs: alarmPrimaryAudioCurrentLG
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
 BOOL testResetPrimaryAlarmAudioCurrentLGOverride( void )
 {
     BOOL result = FALSE;
@@ -1456,12 +1524,12 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetMeasuredBloodFlowSignalStrengthOverride function overrides the measured
- * blood flow signal strength.
+ * The testSetBackupAlarmAudioCurrentOverride function sets the override of the
+ * alarm audio current (backup) in mA.
  * @details Inputs: none
- * @details Outputs: bloodFlowSignalStrength
- * @param value override measured blood flow signal strength (in %)
- * @return TRUE if override successful, FALSE if not
+ * @details Outputs: alarmBackupAudioCurrent
+ * @param mA milliamps measured from backup channel of primary alarm audio
+ * @return TRUE if override set successful, FALSE if not
  *************************************************************************/
 BOOL testSetBackupAlarmAudioCurrentOverride( F32 mA )
 {
@@ -1470,7 +1538,7 @@
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        alarmBackupAudioCurrent.ovData = MAX_ALARM_VOLUME_LEVEL - mA;
+        alarmBackupAudioCurrent.ovData = mA;
         alarmBackupAudioCurrent.override = OVERRIDE_KEY;
     }
 
@@ -1479,11 +1547,11 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetBackupAlarmAudioCurrentOverride function resets the override
- * of the measured backup alarm audio current.
+ * The testResetBackupAlarmAudioCurrentOverride function resets the override of the
+ * alarm audio current (backup).
  * @details Inputs: none
- * @details Outputs: bloodFlowSignalStrength
- * @return TRUE if reset successful, FALSE if not
+ * @details Outputs: alarmBackupAudioCurrent
+ * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetBackupAlarmAudioCurrentOverride( void )
 {