Index: firmware/App/Services/AlarmMgmtTD.h
===================================================================
diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -rd9b5f588d81e15ed3849222bed3362e15dbf4b0a
--- firmware/App/Services/AlarmMgmtTD.h	(.../AlarmMgmtTD.h)	(revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7)
+++ firmware/App/Services/AlarmMgmtTD.h	(.../AlarmMgmtTD.h)	(revision d9b5f588d81e15ed3849222bed3362e15dbf4b0a)
@@ -58,8 +58,6 @@
     BOOL                alarmsSilenced;                             ///< Alarms are currently silenced?
     U32                 alarmsSilenceStart;                         ///< Time stamp for when alarms were silenced (ms)
     U32                 alarmsSilenceExpiresIn;                     ///< Time until alarm silence expires (seconds)
-    BOOL                alarmsToEscalate;                           ///< Are any active alarms due to escalate (should UI show count down timer?)
-    U32                 alarmsEscalatesIn;                          ///< Time until alarm will escalate (seconds)
     ALARM_ID_T          alarmTop;                                   ///< ID of current top alarm that will drive lamp/audio and UI should be displaying right now
     BOOL                topAlarmConditionDetected;                  ///< Condition for top alarm is still being detected
     BOOL                systemFault;                                ///< A system fault is active?
@@ -113,7 +111,6 @@
 {
     U32 alarmState;                                             ///< Alarm state: 0 = no alarms, 1 = low priority, 2 = medium priority, 3 = high priority
     U32 alarmTop;                                               ///< ID of top active alarm
-    U32 escalatesIn;                                            ///< Top active alarm escalates in this many seconds
     U32 silenceExpiresIn;                                       ///< Silencing of alarms expires in this many seconds
     U16 alarmsFlags;                                            ///< Bit flags: 1 = true, 0 = false for each bit flag
 } ALARM_COMP_STATUS_PAYLOAD_T;
@@ -155,12 +152,10 @@
 void handleActiveAlarmListRequest( void );
 void handleResendActiveAlarmsRequest( void );
 
-BOOL testSetAlarmStartOverride( MESSAGE_T *message );
-BOOL testClearAllAlarms( U32 key );
-BOOL testSetAlarmStatusPublishIntervalOverride( U32 ms );
-BOOL testResetAlarmStatusPublishIntervalOverride( void );
-BOOL testSetAlarmInfoPublishIntervalOverride( U32 ms );
-BOOL testResetAlarmInfoPublishIntervalOverride( void );
+BOOL testSetAlarmStartTimeOverride( MESSAGE_T *message );
+BOOL testClearAllAlarms( MESSAGE_T *message );
+BOOL testAlarmStatusPublishIntervalOverride( MESSAGE_T *message );
+BOOL testAlarmInfoPublishIntervalOverride( MESSAGE_T *message );
 
 /**@}*/