Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -r07b9515c080aa68fecfa331cbc593adea4c0b8dc -r4a41a54d255afc5cef0599e2a832927ed2b0ee5d
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 07b9515c080aa68fecfa331cbc593adea4c0b8dc)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 4a41a54d255afc5cef0599e2a832927ed2b0ee5d)
@@ -53,8 +53,8 @@
 
 // ********** private data **********
 
-DATA_DECL( LAMP_PATTERN_T, LampPattern, currentLampPattern, LAMP_PATTERN_OFF, LAMP_PATTERN_FAULT );
-static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_OFF;
+DATA_DECL( LAMP_PATTERN_T, LampPattern, currentLampPattern, LAMP_PATTERN_MANUAL, LAMP_PATTERN_FAULT );
+static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_MANUAL;
 static U32 currentLampPatternStep = 0;
 static U32 lampPatternStepTimer = 0;
 
@@ -86,7 +86,7 @@
  *************************************************************************/
 void initAlarmLamp( void )
 {
-    pendingLampPattern = LAMP_PATTERN_OFF;
+    pendingLampPattern = LAMP_PATTERN_MANUAL;
     currentLampPatternStep = 0;
     lampPatternStepTimer = 0;
 
@@ -218,6 +218,7 @@
             {
                 alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_COMPLETE;
                 setCPLDLampGreen( PIN_SIGNAL_LOW );
+                requestAlarmLampPattern( LAMP_PATTERN_OK );
                 result = SELF_TEST_STATUS_PASSED;
             }
             break;