Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rfad48c849d3bef75edacc23ff48a9a7190c5b3c3 -r08cb5828a2843c39298df7119c3a1c0789c91f99
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision fad48c849d3bef75edacc23ff48a9a7190c5b3c3)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 08cb5828a2843c39298df7119c3a1c0789c91f99)
@@ -62,8 +62,8 @@
 #define CLR_BACKUP_AUDIO_ENABLE()             {mibspiREG3->PC3 &= ~BACKUP_AUDIO_ENABLE_SPI3_PORT_MASK;} ///< Macro to disable backup alarm audio.
 
 #define ALARM_AUDIO_TEST_TONE                 4                                                         ///< Alarm audio state for continuous test tone.
-#define ALARM_AUDIO_CURRENT_HG_MIN_MA         20.0F                                                     ///< Minimum audio current (high gain) during test tone self-test (in mA).  // TODO - Why is HG so low?  S/B same as LG I think.
-#define ALARM_AUDIO_CURRENT_LG_MIN_MA         60.0F                                                     ///< Minimum audio current (low gain) during test tone self-test (in mA).
+#define ALARM_AUDIO_CURRENT_LG_MIN_MA         50.0F                                                     ///< Minimum audio current (low gain) during test tone self-test (in mA).
+#define ALARM_AUDIO_CURRENT_LG_MAX_MA         20.0F                                                     ///< Maximum audio current (low gain) during no tone self-test (in mA).
 #define ALARM_AUDIO_MAX_TEST_TIME_MS          1000                                                      ///< Maximum time for audio current to reach threshold in test.
 #define MAX_ALARM_AUDIO_VOLUME_INDEX          0                                                         ///< Index for maximum alarm audio volume.
 #define MIN_ALARM_AUDIO_VOLUME_INDEX          (MAX_ALARM_VOLUME_LEVEL - 1 )                             ///< Index for minimum alarm audio volume.
@@ -79,10 +79,11 @@
 /// Enumeration of alarm audio self-test states.
 typedef enum Alarm_Lamp_Self_Test_States
 {
-    ALARM_AUDIO_SELF_TEST_STATE_START = 0,      ///< Start state of alarm lamp self-test.
-    ALARM_AUDIO_SELF_TEST_STATE_PRIMARY,        ///< Red state of alarm lamp self-test.
-    ALARM_AUDIO_SELF_TEST_STATE_COMPLETE,       ///< Completed state of alarm lamp self-test.
-    NUM_OF_ALARM_AUDIO_SELF_TEST_STATES         ///< Number of states in alarm lamp self-test.
+    ALARM_AUDIO_SELF_TEST_STATE_START = 0,      ///< Start state of alarm audio self-test.
+    ALARM_AUDIO_SELF_TEST_STATE_PRIMARY,        ///< Test tone state of alarm audio self-test.
+    ALARM_AUDIO_SELF_TEST_STATE_NO_TONE,        ///< No tone state of alarm audio self-test.
+    ALARM_AUDIO_SELF_TEST_STATE_COMPLETE,       ///< Completed state of alarm audio self-test.
+    NUM_OF_ALARM_AUDIO_SELF_TEST_STATES         ///< Number of states in alarm audio self-test.
 } ALARM_AUDIO_SELF_TEST_STATE_T;
 
 /// Enumeration of alarm audio volume factors.
@@ -109,6 +110,7 @@
 static OVERRIDE_U32_T alarmStartedAt[ NUM_OF_ALARM_IDS ];                           ///< Table - when alarm became active for each alarm (if active) or zero (if inactive)
 static U32 alarmStatusPublicationTimerCounter = 0;                                  ///< Used to schedule alarm status publication to CAN bus.
 static U32 alarmInfoPublicationTimerCounter = 0;                                    ///< Used to schedule alarm information publication to CAN bus.
+static U32 audioTestStartTime;                                                      ///< Start time of audio alarm current self-test.
 
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
 static OVERRIDE_U32_T alarmStatusPublishInterval = { ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, 0 };
@@ -1374,39 +1376,56 @@
 SELF_TEST_STATUS_T execAlarmAudioSelfTest( void )
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
-    static U32 testStartTime;
+    F32 almLGCurrent = getIntADCVoltageConverted( INT_ADC_PRIMARY_ALARM_CURRENT_LG );
 
     switch ( alarmAudioSelfTestState )
     {
         case ALARM_AUDIO_SELF_TEST_STATE_START:
-            testStartTime = getMSTimerCount();
-            // Start test tone
-            alarmAudioTestToneRequested = TRUE;
-            setAlarmAudio();
-            alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_PRIMARY;
+            if ( almLGCurrent < ALARM_AUDIO_CURRENT_LG_MAX_MA )
+            {
+                audioTestStartTime = getMSTimerCount();
+                // Start test tone
+                alarmAudioTestToneRequested = TRUE;
+                setAlarmAudio();
+                alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_PRIMARY;
+            }
+            else
+            {
+                result = SELF_TEST_STATUS_FAILED;
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, almLGCurrent, ALARM_AUDIO_CURRENT_LG_MAX_MA );
+                alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_COMPLETE;
+            }
             break;
 
         case ALARM_AUDIO_SELF_TEST_STATE_PRIMARY:
+            // Check if alarm audio current is sufficiently high indicating alarm tone is being output
+            if ( almLGCurrent > ALARM_AUDIO_CURRENT_LG_MIN_MA )
             {
-                F32 almHGCurrent = getIntADCVoltageConverted( INT_ADC_PRIMARY_ALARM_CURRENT_HG );
-                F32 almLGCurrent = getIntADCVoltageConverted( INT_ADC_PRIMARY_ALARM_CURRENT_LG );
+                alarmAudioTestToneRequested = FALSE;
+                audioTestStartTime = getMSTimerCount();
+                alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_NO_TONE;
+            }
+            else if ( TRUE == didTimeout( audioTestStartTime, ALARM_AUDIO_MAX_TEST_TIME_MS ) )
+            {
+                alarmAudioTestToneRequested = FALSE;
+                result = SELF_TEST_STATUS_FAILED;
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, almLGCurrent, ALARM_AUDIO_CURRENT_LG_MIN_MA );
+                alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_COMPLETE;
+            }
+            break;
 
-                // Check if alarm audio current is sufficiently high indicating alarm tone is being output
-                if ( ( almHGCurrent > ALARM_AUDIO_CURRENT_HG_MIN_MA ) &&
-                     ( almLGCurrent > ALARM_AUDIO_CURRENT_LG_MIN_MA ) )
-                {
-                    alarmAudioTestToneRequested = FALSE;
-                    result = SELF_TEST_STATUS_PASSED;
-                    alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_COMPLETE;
-                }
-                else if ( TRUE == didTimeout( testStartTime, ALARM_AUDIO_MAX_TEST_TIME_MS ) )
-                {
-                    alarmAudioTestToneRequested = FALSE;
-                    result = SELF_TEST_STATUS_FAILED;
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, almHGCurrent, almLGCurrent );
-                    alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_COMPLETE;
-                }
+        case ALARM_AUDIO_SELF_TEST_STATE_NO_TONE:
+            if ( almLGCurrent < ALARM_AUDIO_CURRENT_LG_MAX_MA )
+            {
+                result = SELF_TEST_STATUS_PASSED;
+                alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_COMPLETE;
             }
+            else if ( TRUE == didTimeout( audioTestStartTime, ALARM_AUDIO_MAX_TEST_TIME_MS ) )
+            {
+                result = SELF_TEST_STATUS_FAILED;
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, almLGCurrent, ALARM_AUDIO_CURRENT_LG_MAX_MA );
+                alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_COMPLETE;
+            }
             break;
 
         case ALARM_AUDIO_SELF_TEST_STATE_COMPLETE: