Index: vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst
===================================================================
diff -u -r1413d41d1fb181d77e9eb6aa63d63deb261aa1c2 -rc959d47ee96dcb4f262d09a738ec5f93b76e61cd
--- vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst	(.../ALARMMGMT.tst)	(revision 1413d41d1fb181d77e9eb6aa63d63deb261aa1c2)
+++ vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst	(.../ALARMMGMT.tst)	(revision c959d47ee96dcb4f262d09a738ec5f93b76e61cd)
@@ -235,15 +235,15 @@
 TEST.SUBPROGRAM:clearAlarm
 TEST.NEW
 TEST.NAME:clearAlarm_NominalPath
-TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK]:1
-TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK].data:5000
-TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmPriorityFIFO[ALARM_PRIORITY_MEDIUM]:ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
-TEST.VALUE:AlarmMgmt.clearAlarm.alarm:ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_SITTING_WARNING]:1
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_SITTING_WARNING].data:5000
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmPriorityFIFO[ALARM_PRIORITY_MEDIUM]:ALARM_ID_BLOOD_SITTING_WARNING
+TEST.VALUE:AlarmMgmt.clearAlarm.alarm:ALARM_ID_BLOOD_SITTING_WARNING
 TEST.VALUE:uut_prototype_stubs.broadcastAlarmCleared.return:1
-TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK]:0
-TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK].data:0
+TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_SITTING_WARNING]:0
+TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_SITTING_WARNING].data:0
 TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmPriorityFIFO[ALARM_PRIORITY_MEDIUM]:ALARM_ID_NO_ALARM
-TEST.EXPECTED:uut_prototype_stubs.broadcastAlarmCleared.alarm:MACRO=ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
+TEST.EXPECTED:uut_prototype_stubs.broadcastAlarmCleared.alarm:25
 TEST.END
 
 -- Test Case: clearAlarm_NotActive
@@ -261,15 +261,15 @@
 TEST.SUBPROGRAM:clearAlarm
 TEST.NEW
 TEST.NAME:clearAlarm_NotInFIFO
-TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK]:1
-TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK].data:5000
-TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmPriorityFIFO[ALARM_PRIORITY_MEDIUM]:ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK
-TEST.VALUE:AlarmMgmt.clearAlarm.alarm:ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_SITTING_WARNING]:1
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_SITTING_WARNING].data:5000
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.alarmPriorityFIFO[ALARM_PRIORITY_MEDIUM]:ALARM_ID_BLOOD_SITTING_WARNING
+TEST.VALUE:AlarmMgmt.clearAlarm.alarm:ALARM_ID_BLOOD_SITTING_WARNING
 TEST.VALUE:uut_prototype_stubs.broadcastAlarmCleared.return:1
-TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK]:0
-TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK].data:0
-TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmPriorityFIFO[ALARM_PRIORITY_MEDIUM]:ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK
-TEST.EXPECTED:uut_prototype_stubs.broadcastAlarmCleared.alarm:MACRO=ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
+TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmIsActive[ALARM_ID_BLOOD_SITTING_WARNING]:0
+TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmStartedAt[ALARM_ID_BLOOD_SITTING_WARNING].data:0
+TEST.EXPECTED:AlarmMgmt.<<GLOBAL>>.alarmPriorityFIFO[ALARM_PRIORITY_MEDIUM]:ALARM_ID_NO_ALARM
+TEST.EXPECTED:uut_prototype_stubs.broadcastAlarmCleared.alarm:25
 TEST.END
 
 -- Subprogram: execAlarmMgmt