Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r90f6438e80dbe0a32472a076a0d1bc54db65d15a -r3417fd56afc9b21fb4c2d86c75dd33ac31fbd9f1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 90f6438e80dbe0a32472a076a0d1bc54db65d15a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3417fd56afc9b21fb4c2d86c75dd33ac31fbd9f1)
@@ -561,7 +561,7 @@
             // if a minimum sized msg would fit in remaining, continue
             if ( remSize >= MESSAGE_OVERHEAD_SIZE )
             {
-                payloadSize = data[pos+sizeof(U16)];
+                payloadSize = data[pos + sizeof(U16)];
                 msgSize = MESSAGE_OVERHEAD_SIZE + payloadSize;
                 // we now know the size of the message - we can now know if full message is contained in buffer
                 if ( msgSize <= remSize )
@@ -647,7 +647,7 @@
     }
 
     // handle any test messages if tester has logged in successfully
-    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID < NUM_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
+    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
     {
         switch ( msgID )
         {
@@ -699,6 +699,10 @@
                 handleTestBloodFlowBroadcastIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE:
+                handleTestAlarmStatusBroadcastIntervalOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;