Index: vectorcast/Hercules_RM46_HD_Project/environment/AIRTRAP/AIRTRAP.tst
===================================================================
diff -u -r877d1cd270d4126163bfd6f5333e72ed94d32061 -r3c83df47e1ceb95e736322f79d85b707fdeac099
--- vectorcast/Hercules_RM46_HD_Project/environment/AIRTRAP/AIRTRAP.tst	(.../AIRTRAP.tst)	(revision 877d1cd270d4126163bfd6f5333e72ed94d32061)
+++ vectorcast/Hercules_RM46_HD_Project/environment/AIRTRAP/AIRTRAP.tst	(.../AIRTRAP.tst)	(revision 3c83df47e1ceb95e736322f79d85b707fdeac099)
@@ -796,12 +796,13 @@
 TEST.NEW
 TEST.NAME:handleAirTrapValveClosedState.006
 TEST.IMPORT_FAILURES:
-(E) @LINE: 743 TEST.VALUE:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:3
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
-(E) @LINE: 747 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:3
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 743 TEST.VALUE:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:3
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
+    >>> (E) @LINE: 747 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:3
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.NOTES:
 This is an automatically generated test case.
@@ -914,9 +915,10 @@
 TEST.NEW
 TEST.NAME:handleAirTrapValveClosedState.011
 TEST.IMPORT_FAILURES:
-(E) @LINE: 859 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:1
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 859 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:1
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.NOTES:
 This is an automatically generated test case.
@@ -944,9 +946,10 @@
 TEST.NEW
 TEST.NAME:handleAirTrapValveClosedState.012
 TEST.IMPORT_FAILURES:
-(E) @LINE: 886 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:1
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 886 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:1
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.NOTES:
 This is an automatically generated test case.
@@ -975,12 +978,13 @@
 TEST.NEW
 TEST.NAME:handleAirTrapValveClosedState.013
 TEST.IMPORT_FAILURES:
-(E) @LINE: 909 TEST.VALUE:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:2
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
-(E) @LINE: 914 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:3
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 909 TEST.VALUE:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:2
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
+    >>> (E) @LINE: 914 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:3
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.NOTES:
 This is an automatically generated test case.
@@ -1012,9 +1016,10 @@
 TEST.NEW
 TEST.NAME:handleAirTrapValveClosedState.014
 TEST.IMPORT_FAILURES:
-(E) @LINE: 941 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:0
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 941 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:0
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.NOTES:
 This is an automatically generated test case.
@@ -1071,12 +1076,13 @@
 TEST.NEW
 TEST.NAME:handleAirTrapValveClosedState.016
 TEST.IMPORT_FAILURES:
-(E) @LINE: 990 TEST.VALUE:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:100
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
-(E) @LINE: 995 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:101
-    >>> Unknown parameter/object name airPumpUpperLevelCtr
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 990 TEST.VALUE:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:100
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
+    >>> (E) @LINE: 995 TEST.EXPECTED:AirTrap.<<GLOBAL>>.airPumpUpperLevelCtr:101
+    >>>     >>> Unknown parameter/object name airPumpUpperLevelCtr
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.NOTES:
 This is an automatically generated test case.
Index: vectorcast/Hercules_RM46_HD_Project/environment/PRESOCCL/PRESOCCL.tst
===================================================================
diff -u -r57b932caef8b1174c28676198dcd0beb23ab4107 -r3c83df47e1ceb95e736322f79d85b707fdeac099
--- vectorcast/Hercules_RM46_HD_Project/environment/PRESOCCL/PRESOCCL.tst	(.../PRESOCCL.tst)	(revision 57b932caef8b1174c28676198dcd0beb23ab4107)
+++ vectorcast/Hercules_RM46_HD_Project/environment/PRESOCCL/PRESOCCL.tst	(.../PRESOCCL.tst)	(revision 3c83df47e1ceb95e736322f79d85b707fdeac099)
@@ -163,8 +163,8 @@
 TEST.STUB:PresOccl.getFilteredArterialPressure
 TEST.VALUE:PresOccl.getFilteredArterialPressure.return:-1600.0
 TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
-TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:<<MAX>>
 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:<<MAX>>
 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1
 TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE
 TEST.END
@@ -202,8 +202,8 @@
 TEST.VALUE:PresOccl.<<GLOBAL>>.pressureLimitsActive:1
 TEST.VALUE:PresOccl.getFilteredArterialPressure.return:-301.0,101.0
 TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
-TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:0
 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:0
 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1
 TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_ARTERIAL_PRESSURE_LOW,ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH
 TEST.END
@@ -548,8 +548,8 @@
 TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_NONE
 TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.flt.data:0.0
 TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
-TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:52
 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:52
 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.isErrorOccurred:(2)0,1
 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:(2)0,1
 TEST.EXPECTED:uut_prototype_stubs.isPersistentAlarmTriggered.isErrorOccurred:(3)0
@@ -1556,8 +1556,8 @@
 TEST.STUB:PresOccl.getFilteredVenousPressure
 TEST.VALUE:PresOccl.getFilteredVenousPressure.return:3.40282E+38
 TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:<<MIN>>
-TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:<<MIN>>
 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:<<MIN>>
 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.alarmIndex:ALARM_ID_HD_VENOUS_PRESSURE_LOW
 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.isErrorOccurred:1,(2)0,1
 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:<<MIN>>
@@ -1928,10 +1928,11 @@
 TEST.NEW
 TEST.NAME:checkVenousPressureInRange.030
 TEST.IMPORT_FAILURES:
-(E) @LINE: 107 TEST.VALUE:uut_prototype_stubs.getTargetBloodFlowRate.return:<<MIN>>
-    >>> Could not find function getTargetBloodFlowRate
-    >>>    in unit uut_prototype_stubs.
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 107 TEST.VALUE:uut_prototype_stubs.getTargetBloodFlowRate.return:<<MIN>>
+    >>>     >>> Could not find function getTargetBloodFlowRate
+    >>>     >>>    in unit uut_prototype_stubs.
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.STUB:PresOccl.getFilteredVenousPressure
 TEST.VALUE:PresOccl.<<GLOBAL>>.pressureLimitsActive:1
@@ -2393,6 +2394,24 @@
 TEST.EXPECTED:PresOccl.<<GLOBAL>>.currentVenousMaxLimit:400
 TEST.END
 
+-- Test Case: determineArtVenPressureLimits.007
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:determineArtVenPressureLimits
+TEST.NEW
+TEST.NAME:determineArtVenPressureLimits.007
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 2
+      (1) if ((PRESSURE_LIMITS_STATE_STABLE) == currPresLimitsState) ==> FALSE
+      (6) if (currPresLimitsState > (PRESSURE_LIMITS_STATE_IDLE)) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.VALUE:PresOccl.<<GLOBAL>>.stableArterialPressure:-280
+TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32.return:80
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currentArterialMinLimit:-300
+TEST.END
+
 -- Subprogram: execPresOccl
 
 -- Test Case: execPresOccl_ContReadState
@@ -2847,9 +2866,10 @@
 TEST.NEW
 TEST.NAME:execPressureLimits.009
 TEST.IMPORT_FAILURES:
-(E) @LINE: 132 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:1
-    >>> Unknown parameter/object name useShortStabilizeTime
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 132 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:1
+    >>>     >>> Unknown parameter/object name useShortStabilizeTime
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.BASIS_PATH:9 of 17
 TEST.NOTES:
@@ -2876,9 +2896,10 @@
 TEST.NEW
 TEST.NAME:execPressureLimits.010
 TEST.IMPORT_FAILURES:
-(E) @LINE: 156 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:0
-    >>> Unknown parameter/object name useShortStabilizeTime
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 156 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:0
+    >>>     >>> Unknown parameter/object name useShortStabilizeTime
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.BASIS_PATH:10 of 17
 TEST.NOTES:
@@ -4225,12 +4246,13 @@
 TEST.NEW
 TEST.NAME:signalInitiatePressureStabilization.001
 TEST.IMPORT_FAILURES:
-(E) @LINE: 177 TEST.VALUE:PresOccl.signalInitiatePressureStabilization.useShort:20
-    >>> Unknown parameter/object name useShort
-    >>> Value Line Error - Command Ignored
-(E) @LINE: 178 TEST.EXPECTED:PresOccl.<<GLOBAL>>.useShortStabilizeTime:20
-    >>> Unknown parameter/object name useShortStabilizeTime
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 177 TEST.VALUE:PresOccl.signalInitiatePressureStabilization.useShort:20
+    >>>     >>> Unknown parameter/object name useShort
+    >>>     >>> Value Line Error - Command Ignored
+    >>> (E) @LINE: 178 TEST.EXPECTED:PresOccl.<<GLOBAL>>.useShortStabilizeTime:20
+    >>>     >>> Unknown parameter/object name useShortStabilizeTime
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.BASIS_PATH:1 of 3
 TEST.NOTES:
@@ -4315,10 +4337,42 @@
 TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION
 TEST.VALUE:PresOccl.<<GLOBAL>>.stabilizationStartTimeMs:1000
 TEST.VALUE:PresOccl.signalInitiatePressureStabilization.stabilizationPeriod:USE_SHORT_STABILIZATION_PERIOD
+TEST.VALUE:uut_prototype_stubs.u32DiffWithWrap.return:54000
 TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:54000
-TEST.EXPECTED:PresOccl.<<GLOBAL>>.stabilizationStartTimeMs:1000
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.stabilizationStartTimeMs:54000
 TEST.END
 
+-- Test Case: signalInitiatePressureStabilization.006
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:signalInitiatePressureStabilization
+TEST.NEW
+TEST.NAME:signalInitiatePressureStabilization.006
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 2
+      (1) if ((PRESSURE_LIMITS_STATE_STABILIZATION) == currPresLimitsState) ==> FALSE
+      (2) if ((PRESSURE_LIMITS_STATE_STABLE) == currPresLimitsState) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.VALUE:PresOccl.<<GLOBAL>>.stabilizationStartTimeMs:1000
+TEST.VALUE:PresOccl.signalInitiatePressureStabilization.stabilizationPeriod:USE_SHORT_STABILIZATION_PERIOD
+TEST.VALUE:uut_prototype_stubs.u32DiffWithWrap.return:54000
+TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:54000
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.stabilizationStartTimeMs:54000
+TEST.END
+
+-- Subprogram: signalLowVenousPressureCheck
+
+-- Test Case: signalLowVenousPressureCheck.001
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:signalLowVenousPressureCheck
+TEST.NEW
+TEST.NAME:signalLowVenousPressureCheck.001
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.lowVenousPressureExemptCheck:1
+TEST.END
+
 -- Subprogram: testResetArterialPressureOverride
 
 -- Test Case: testResetArterialPressureOverride_LoggedIn
@@ -4693,9 +4747,10 @@
 TEST.NEW
 TEST.NAME:updatePressureLimitWindows.001
 TEST.IMPORT_FAILURES:
-(E) @LINE: 195 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:1
-    >>> Unknown parameter/object name useShortStabilizeTime
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 195 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:1
+    >>>     >>> Unknown parameter/object name useShortStabilizeTime
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.BASIS_PATH:1 of 3
 TEST.NOTES:
@@ -4707,6 +4762,7 @@
 TEST.END_NOTES:
 TEST.STUB:PresOccl.getFilteredArterialPressure
 TEST.STUB:PresOccl.getFilteredVenousPressure
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_SHORT_STABILIZATION_PERIOD
 TEST.VALUE:PresOccl.getFilteredArterialPressure.return:100.0
 TEST.VALUE:PresOccl.getFilteredVenousPressure.return:100.0
 TEST.EXPECTED:PresOccl.<<GLOBAL>>.stableArterialPressure:100
@@ -4719,9 +4775,10 @@
 TEST.NEW
 TEST.NAME:updatePressureLimitWindows.002
 TEST.IMPORT_FAILURES:
-(E) @LINE: 216 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:1
-    >>> Unknown parameter/object name useShortStabilizeTime
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 216 TEST.VALUE:PresOccl.<<GLOBAL>>.useShortStabilizeTime:1
+    >>>     >>> Unknown parameter/object name useShortStabilizeTime
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.BASIS_PATH:2 of 3
 TEST.NOTES:
@@ -4733,8 +4790,34 @@
 TEST.END_NOTES:
 TEST.STUB:PresOccl.getFilteredArterialPressure
 TEST.STUB:PresOccl.getFilteredVenousPressure
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_SHORT_STABILIZATION_PERIOD
 TEST.VALUE:PresOccl.getFilteredArterialPressure.return:-95.5
 TEST.VALUE:PresOccl.getFilteredVenousPressure.return:-95.5
 TEST.EXPECTED:PresOccl.<<GLOBAL>>.stableArterialPressure:-96
 TEST.EXPECTED:PresOccl.<<GLOBAL>>.stableVenousPressure:-96
 TEST.END
+
+-- Test Case: updatePressureLimitWindows.003
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:updatePressureLimitWindows
+TEST.NEW
+TEST.NAME:updatePressureLimitWindows.003
+TEST.NOTES:
+This is an automatically generated test case.
+Test Path 1
+(1) if (filtArt < (0.0F)) ==> FALSE
+(2) if (filtVen < (0.0F)) ==> FALSE
+Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.STUB:PresOccl.getFilteredArterialPressure
+TEST.STUB:PresOccl.getLongFilteredArterialPressure
+TEST.STUB:PresOccl.getFilteredVenousPressure
+TEST.STUB:PresOccl.getLongFilteredVenousPressure
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_NORMAL_STABILIZATION_PERIOD
+TEST.VALUE:PresOccl.getFilteredArterialPressure.return:100.0
+TEST.VALUE:PresOccl.getLongFilteredArterialPressure.return:100.0
+TEST.VALUE:PresOccl.getFilteredVenousPressure.return:100.0
+TEST.VALUE:PresOccl.getLongFilteredVenousPressure.return:100.0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.stableArterialPressure:100
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.stableVenousPressure:100
+TEST.END