Index: vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst
===================================================================
diff -u -r202a7e6c312e5dc5b85c0d2a30689c6d35a4358b -re3c49e78e5b58ecf5989cb825a1f7cc1ecf0a80d
--- vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst	(.../RESERVOIRS.tst)	(revision 202a7e6c312e5dc5b85c0d2a30689c6d35a4358b)
+++ vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst	(.../RESERVOIRS.tst)	(revision e3c49e78e5b58ecf5989cb825a1f7cc1ecf0a80d)
@@ -154,30 +154,29 @@
 
 -- Subprogram: checkReservoirMaxVolume
 
--- Test Case: checkReservoirMaxVolume.001
+-- Test Case: checkReservoirMaxVolum3_Nominal
 TEST.UNIT:Reservoirs
 TEST.SUBPROGRAM:checkReservoirMaxVolume
 TEST.NEW
-TEST.NAME:checkReservoirMaxVolume.001
+TEST.NAME:checkReservoirMaxVolum3_Nominal
 TEST.VALUE:Reservoirs.<<GLOBAL>>.activeReservoir:DG_RESERVOIR_1
-TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.dataType:ALARM_DATA_TYPE_F32
-TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.data.flt.data:0.0
 TEST.VALUE:uut_prototype_stubs.getDGActiveReservoir.return:DG_RESERVOIR_1
-TEST.VALUE:uut_prototype_stubs.getReservoirWeight.return:1900.0
+TEST.VALUE:uut_prototype_stubs.getReservoirWeight.return:1800.0
 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.activeReservoir:DG_RESERVOIR_1
-TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarmData.dataType:ALARM_DATA_TYPE_F32
-TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarmData.data.flt.data:1900.0
 TEST.END
 
--- Test Case: checkReservoirMaxVolume.002
+-- Test Case: checkReservoirMaxVolume_Alarm
 TEST.UNIT:Reservoirs
 TEST.SUBPROGRAM:checkReservoirMaxVolume
 TEST.NEW
-TEST.NAME:checkReservoirMaxVolume.002
+TEST.NAME:checkReservoirMaxVolume_Alarm
 TEST.VALUE:Reservoirs.<<GLOBAL>>.activeReservoir:DG_RESERVOIR_1
+TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.dataType:ALARM_DATA_TYPE_F32
+TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.data.flt.data:0.0
 TEST.VALUE:uut_prototype_stubs.getDGActiveReservoir.return:DG_RESERVOIR_1
-TEST.VALUE:uut_prototype_stubs.getReservoirWeight.return:1800.0
-TEST.EXPECTED:Reservoirs.<<GLOBAL>>.activeReservoir:DG_RESERVOIR_1
+TEST.VALUE:uut_prototype_stubs.getReservoirWeight.return:1951.0
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarmData.dataType:ALARM_DATA_TYPE_F32
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarmData.data.flt.data:1951.0
 TEST.END
 
 -- Subprogram: execReservoirs
@@ -316,7 +315,7 @@
 TEST.VALUE:Reservoirs.<<GLOBAL>>.activeReservoir:DG_RESERVOIR_1
 TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.acidMixingRatio:0.0
 TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.bicarbMixingRatio:0.0
-TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.timeFillPrepMS:00
+TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.timeFillPrepMS:0
 TEST.VALUE:Reservoirs.handleReservoirMgmtWaitToFillState.return:TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE
 TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_FAUL
 TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:0
@@ -350,7 +349,7 @@
 TEST.VALUE:Reservoirs.<<GLOBAL>>.activeReservoir:DG_RESERVOIR_1
 TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.acidMixingRatio:0.0
 TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.bicarbMixingRatio:0.0
-TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.timeFillPrepMS:00
+TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.timeFillPrepMS:0
 TEST.VALUE:Reservoirs.handleReservoirMgmtFillState.return:TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE
 TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_FAUL
 TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:0
@@ -450,9 +449,9 @@
 TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.bicarbMixingRatio:1.0
 TEST.VALUE:Reservoirs.<<GLOBAL>>.ratios.timeFillPrepMS:1
 TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.dataType:ALARM_DATA_TYPE_F32
-TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.data.uInt.data:SW_FAULT_ID_INVALID_TREATMENT_RESERVOIR_MANAGEMENT_STATE
+TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.data.uInt.data:MACRO=SW_FAULT_ID_INVALID_TREATMENT_RESERVOIR_MANAGEMENT_STATE
 TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:SW_FAULT_ID_INVALID_TREATMENT_RESERVOIR_MANAGEMENT_STATE
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=SW_FAULT_ID_INVALID_TREATMENT_RESERVOIR_MANAGEMENT_STATE
 TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:1
 TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_SERV
 TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:1
@@ -643,7 +642,7 @@
 TEST.NAME:handleReservoirMgmtFillState.002
 TEST.STUB:Reservoirs.getReservoirRecirculationMaxPercent
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_GENE
-TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
 TEST.VALUE:Reservoirs.<<GLOBAL>>.reservoirSwitchStartTimeMS:0
 TEST.VALUE:Reservoirs.getReservoirRecirculationMaxPercent.return:1.0
@@ -715,7 +714,7 @@
 TEST.NEW
 TEST.NAME:handleReservoirMgmtStartState.002
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_GENE
-TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.VALUE:uut_prototype_stubs.cmdStartDGDrain.drainToVolMl:0
 TEST.VALUE:uut_prototype_stubs.cmdStartDGDrain.tareLoadCell:0
 TEST.VALUE:uut_prototype_stubs.cmdStartDGDrain.rinse:0
@@ -734,7 +733,7 @@
 TEST.NAME:handleReservoirMgmtStartState.003
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_DRAI
 TEST.VALUE:Reservoirs.handleReservoirMgmtStartState.return:TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE
-TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_DRAI
 TEST.EXPECTED:Reservoirs.handleReservoirMgmtStartState.return:TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE
 TEST.END
@@ -746,7 +745,7 @@
 TEST.NAME:handleReservoirMgmtStartState.004
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_FLUS
 TEST.VALUE:Reservoirs.handleReservoirMgmtStartState.return:TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE
-TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_FLUS
 TEST.EXPECTED:Reservoirs.handleReservoirMgmtStartState.return:TREATMENT_RESERVOIR_MGMT_START_STATE
 TEST.END
@@ -964,7 +963,7 @@
 TEST.VALUE:Reservoirs.<<GLOBAL>>.volSpentML:1.0
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dilutionLevelPct:1.0
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_FAUL
-TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.VALUE:Reservoirs.<<GLOBAL>>.prevTargetFillVolumeML[DG_RESERVOIR_1]:2
 TEST.VALUE:Reservoirs.getTargetFillFlowRateLPM.return:1.0
 TEST.VALUE:Reservoirs.handleReservoirMgmtWaitToFillState.return:TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE
@@ -1027,7 +1026,7 @@
 TEST.NEW
 TEST.NAME:handleReservoirMgmtWaitToFillState.006
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_STAN
-TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.VALUE:Reservoirs.<<GLOBAL>>.prevTargetFillVolumeML[DG_RESERVOIR_1]:1
 TEST.VALUE:Reservoirs.handleReservoirMgmtWaitToFillState.return:TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE
 TEST.VALUE:uut_prototype_stubs.getDGActiveReservoir.return:NUM_OF_DG_RESERVOIRS
@@ -1105,7 +1104,7 @@
 TEST.VALUE:Reservoirs.<<GLOBAL>>.timeDepleteMS:1
 TEST.VALUE:Reservoirs.<<GLOBAL>>.volSpentML:0.0
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_FILL
-TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.VALUE:Reservoirs.<<GLOBAL>>.dgSubMode:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.VALUE:Reservoirs.<<GLOBAL>>.timeWaitToFillMS:1
 TEST.VALUE:Reservoirs.<<GLOBAL>>.prevTargetFillVolumeML[DG_RESERVOIR_1]:1000
 TEST.VALUE:Reservoirs.getTargetFillFlowRateLPM.return:1.0
@@ -1116,7 +1115,7 @@
 TEST.VALUE:uut_prototype_stubs.getReservoirUltrafiltrationVol.return:0.0
 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.timeDepleteMS:0
 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.volSpentML:0.0
-TEST.EXPECTED:Reservoirs.<<GLOBAL>>.dgSubMode:DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
+TEST.EXPECTED:Reservoirs.<<GLOBAL>>.dgSubMode:MACRO=DG_GEN_IDLE_MODE_STATE_FLUSH_WATER
 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.timeWaitToFillMS:0
 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.prevTargetFillVolumeML[DG_RESERVOIR_1]:1000
 TEST.EXPECTED:Reservoirs.handleReservoirMgmtWaitToFillState.return:TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE