Index: vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst
===================================================================
diff -u -rc04cc40081b7ab8f279f96197e9de9c982cbd19d -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst	(.../BLOODFLOW.tst)	(revision c04cc40081b7ab8f279f96197e9de9c982cbd19d)
+++ vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst	(.../BLOODFLOW.tst)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -896,6 +896,38 @@
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.errorBloodRotorSpeedPersistTimerCtr:0
 TEST.END
 
+-- Test Case: checkBloodPumpSpeeds.004
+TEST.UNIT:BloodFlow
+TEST.SUBPROGRAM:checkBloodPumpSpeeds
+TEST.NEW
+TEST.NAME:checkBloodPumpSpeeds.004
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 5
+      (1) if ((1) == isPersistentAlarmTriggered(ALARM_ID_BLOOD_PUMP_OFF_CHECK, 0 == targetBloodFlowRate && measMotorSpeed > (100.0F))) ==> FALSE
+      (2) if ((BLOOD_PUMP_CONTROL_TO_TARGET_STATE) == bloodPumpState) ==> TRUE
+      (3) if (bloodPumpDirectionSet == (MOTOR_DIR_FORWARD)) ==> FALSE
+      (4) if ((1) == isPersistentAlarmTriggered(ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK, deltaMotorSpeed > (300.0F) || deltaMCMotorSpeed > (300.0F))) ==> TRUE
+      (5) if (deltaRotorSpeed > (2.0F) && measMotorSpeedDeltaPct > (0.150000006F)) ==> FALSE
+   Test Case Generation Notes:
+      Cannot set local variable measMotorSpeedInRotorRPM in branch 4
+      Conflict: Trying to set variable uut_prototype_stubs.isPersistentAlarmTriggered.return 'equal to' and 'not equal to' same value in branches 1/4
+      Cannot set local variable deltaRotorSpeed in branch 5
+      Cannot set local variable measMotorSpeedDeltaPct in branch 5
+TEST.END_NOTES:
+TEST.STUB:BloodFlow.getMeasuredBloodPumpSpeed
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpDirectionSet:MOTOR_DIR_REVERSE
+TEST.VALUE:BloodFlow.<<GLOBAL>>.errorBloodRotorSpeedPersistTimerCtr:1
+TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate:0
+TEST.VALUE:BloodFlow.getMeasuredBloodPumpSpeed.return:110.0
+TEST.VALUE:uut_prototype_stubs.getCPLDACPowerLossDetected.return:1
+TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:<<MIN>>
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpDirectionSet:MOTOR_DIR_REVERSE
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.errorBloodRotorSpeedPersistTimerCtr:0
+TEST.END
+
 -- Test Case: checkBloodPumpSpeeds_Off_InRange
 TEST.UNIT:BloodFlow
 TEST.SUBPROGRAM:checkBloodPumpSpeeds
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.env
===================================================================
diff -u -rd3c75dd5ffe14fa83d84b5eb991e8e6b03749b18 -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.env	(.../INT_PRESOCCL.env)	(revision d3c75dd5ffe14fa83d84b5eb991e8e6b03749b18)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.env	(.../INT_PRESOCCL.env)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -6,6 +6,7 @@
 ENVIRO.STUB_BY_FUNCTION:ModeInitPOST
 ENVIRO.STUB_BY_FUNCTION:ModePostTreat
 ENVIRO.STUB_BY_FUNCTION:ModePreTreat
+ENVIRO.STUB_BY_FUNCTION:ModeTreatment
 ENVIRO.STUB_BY_FUNCTION:OperationModes
 ENVIRO.UUT:PresOccl
 ENVIRO.STUB_BY_FUNCTION:Rinseback
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.tst
===================================================================
diff -u -r105cc6824fa5e9142bafb27746a2e6f71dbeec98 -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.tst	(.../INT_PRESOCCL.tst)	(revision 105cc6824fa5e9142bafb27746a2e6f71dbeec98)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.tst	(.../INT_PRESOCCL.tst)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -2,7 +2,7 @@
 -- Test Case Script
 -- 
 -- Environment    : INT_PRESOCCL
--- Unit(s) Under Test: AirTrap BloodFlow DialInFlow ModeInitPOST ModePostTreat ModePreTreat OperationModes PresOccl Rinseback SelfTests SystemCommMessages TaskGeneral sys_main
+-- Unit(s) Under Test: AirTrap BloodFlow DialInFlow ModeInitPOST ModePostTreat ModePreTreat ModeTreatment OperationModes PresOccl Rinseback SelfTests SystemCommMessages TaskGeneral sys_main
 -- 
 -- Script Features
 TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING
@@ -88,6 +88,19 @@
 TEST.EXPECTED:ModePostTreat.handlePostTreatmentVerifyState.return:HD_POST_TREATMENT_VERIFY_STATE
 TEST.END
 
+-- Unit: ModeTreatment
+
+-- Subprogram: handleTreatmentBloodPrimeState
+
+-- Test Case: handleTreatmentBloodPrimeState.001
+TEST.UNIT:ModeTreatment
+TEST.SUBPROGRAM:handleTreatmentBloodPrimeState
+TEST.NEW
+TEST.NAME:handleTreatmentBloodPrimeState.001
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.bloodPrimeToDialysisRequest:1
+TEST.EXPECTED:ModeTreatment.handleTreatmentBloodPrimeState.return:TREATMENT_DIALYSIS_STATE
+TEST.END
+
 -- Unit: Rinseback
 
 -- Subprogram: handleRinsebackRunState
@@ -218,6 +231,54 @@
 TEST.EXPECTED:PresOccl.<<GLOBAL>>.arterialPressure.override:0xCCC33C33
 TEST.END
 
+-- Subprogram: handleTestBloodPumpOcclusionBaselineOverrideRequest
+
+-- Test Case: handleTestBloodPumpOcclusionBaselineOverrideRequest.001
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodPumpOcclusionBaselineOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodPumpOcclusionBaselineOverrideRequest.001
+TEST.STUB:SystemCommMessages.isTestingActivated
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.override:1
+TEST.VALUE:SystemCommMessages.isTestingActivated.return:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[7]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[8]:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.override:0xCCC33C33
+TEST.ATTRIBUTES:PresOccl.<<GLOBAL>>.bloodPumpOcclusion.override::EXPECTED_BASE=16
+TEST.END
+
+-- Test Case: handleTestBloodPumpOcclusionBaselineOverrideRequest.002
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodPumpOcclusionBaselineOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodPumpOcclusionBaselineOverrideRequest.002
+TEST.STUB:SystemCommMessages.isTestingActivated
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.isTestingActivated.return:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[7]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpOcclusionBaselineOverrideRequest.message[0].payload[8]:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.override:0x0
+TEST.ATTRIBUTES:PresOccl.<<GLOBAL>>.bloodPumpOcclusion.override::EXPECTED_BASE=16
+TEST.END
+
 -- Subprogram: handleTestBloodPumpOcclusionOverrideRequest
 
 -- Test Case: handleTestBloodPumpOcclusionOverrideRequest_reset
@@ -262,6 +323,52 @@
 TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpOcclusion.override:0xCCC33C33
 TEST.END
 
+-- Subprogram: handleTestFilteredBloodPumpOcclusionOverrideRequest
+
+-- Test Case: handleTestFilteredBloodPumpOcclusionOverrideRequest.001
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestFilteredBloodPumpOcclusionOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestFilteredBloodPumpOcclusionOverrideRequest.001
+TEST.STUB:SystemCommMessages.isTestingActivated
+TEST.VALUE:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.override:1
+TEST.VALUE:SystemCommMessages.isTestingActivated.return:1
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[7]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[8]:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestFilteredBloodPumpOcclusionOverrideRequest.002
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestFilteredBloodPumpOcclusionOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestFilteredBloodPumpOcclusionOverrideRequest.002
+TEST.STUB:SystemCommMessages.isTestingActivated
+TEST.VALUE:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.isTestingActivated.return:1
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[7]:0
+TEST.VALUE:SystemCommMessages.handleTestFilteredBloodPumpOcclusionOverrideRequest.message[0].payload[8]:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.override:0x0
+TEST.END
+
 -- Subprogram: handleTestPresOcclBroadcastIntervalOverrideRequest
 
 -- Test Case: handleTestPresOcclBroadcastIntervalOverrideRequest_reset
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL_cba.cvr
===================================================================
diff -u -re38bc77d881536f690243db021b8c4c3d326f730 -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL_cba.cvr	(.../INT_PRESOCCL_cba.cvr)	(revision e38bc77d881536f690243db021b8c4c3d326f730)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL_cba.cvr	(.../INT_PRESOCCL_cba.cvr)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -177,7 +177,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:17
-IMPORT.SOURCE.ORIG_FILENAME:OperationModes.c
+IMPORT.SOURCE.ORIG_FILENAME:ModeTreatment.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -199,7 +199,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:18
-IMPORT.SOURCE.ORIG_FILENAME:Rinseback.c
+IMPORT.SOURCE.ORIG_FILENAME:OperationModes.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -221,7 +221,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:19
-IMPORT.SOURCE.ORIG_FILENAME:SelfTests.c
+IMPORT.SOURCE.ORIG_FILENAME:Rinseback.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -243,7 +243,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:20
-IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
+IMPORT.SOURCE.ORIG_FILENAME:SelfTests.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -265,7 +265,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:21
-IMPORT.SOURCE.ORIG_FILENAME:TaskGeneral.c
+IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -287,6 +287,28 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:22
+IMPORT.SOURCE.ORIG_FILENAME:TaskGeneral.c
+IMPORT.SOURCE.COVERAGE_STATUS:TRUE
+IMPORT.SOURCE.COVERAGE_TYPE:Function
+IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
+IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:FALSE
+IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE
+IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE
+IMPORT.SOURCE.EDG_COVERAGE:TRUE
+IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:FALSE
+IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE
+IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE
+IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS
+IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE
+IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE
+IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
+IMPORT.SOURCE.END
+IMPORT.SOURCE.BEGIN
+IMPORT.SOURCE.UNIT:23
 IMPORT.SOURCE.ORIG_FILENAME:sys_main.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -345,6 +367,10 @@
 //local function
 3) void updatePressureLimitWindows( void )
 Line # 413
+
+local function
+4) static void setOcclusionBaselineDuringTreatement( void )
+Line # 426
 RESULT.CBA.NOTES_END
 RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Controllers/PresOccl.c
 RESULT.CBA.FUNCTION: getLongFilteredVenousPressure
@@ -379,6 +405,17 @@
 RESULT.CBA.CONTEXT_AFTER_END
 RESULT.CBA.MATCHING_LINE_INDEX: 1
 RESULT.CBA.LINE.END
+RESULT.CBA.FUNCTION: setOcclusionBaselineDuringTreatement
+RESULT.CBA.LINE.BEGIN
+RESULT.CBA.LINE: 0
+RESULT.CBA.COVERAGE: FN
+RESULT.CBA.CONTEXT: {
+RESULT.CBA.CONTEXT_AFTER:
+bloodPumpPartialOcclusionBaseline.data = getFilteredBloodPumpOccl();
+partialBloodPumpOcclBaselineUpdateTimerCounter = 0;
+RESULT.CBA.CONTEXT_AFTER_END
+RESULT.CBA.MATCHING_LINE_INDEX: 1
+RESULT.CBA.LINE.END
 RESULT.CBA.FUNCTION: updatePressureLimitWindows
 RESULT.CBA.LINE.BEGIN
 RESULT.CBA.LINE: 0
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst
===================================================================
diff -u -r120a51317edc52c160b7917327674af2e403ee5e -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst	(.../INT_RTC.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst	(.../INT_RTC.tst)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -79,9 +79,9 @@
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.recordJobQueue[1].memoryLocation:NVDATAMGMT_RTC
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.recordQueueFrontIndex:0
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.recordQueueCount:5
-TEST.VALUE:Utilities.getSemaphore.return:TRUE
-TEST.VALUE:SystemComm.uiCommunicated.return:TRUE
-TEST.EXPECTED:NVDataMgmt.areResourcesAvailableForNextJob.return:TRUE
+TEST.VALUE:Utilities.getSemaphore.return:MACRO=TRUE
+TEST.VALUE:SystemComm.uiCommunicated.return:MACRO=TRUE
+TEST.EXPECTED:NVDataMgmt.areResourcesAvailableForNextJob.return:MACRO=TRUE
 TEST.END
 
 -- Subprogram: handleExecVerifyRTCWriteState
@@ -93,7 +93,7 @@
 TEST.NAME:handleExecVerifyRTCWriteState.001
 TEST.STUB:NVDataMgmt.didCommandTimeout
 TEST.VALUE:NVDataMgmt.didCommandTimeout.state:NVDATAMGMT_EXEC_STATE_VERIFY_RTC_WRITE
-TEST.VALUE:NVDataMgmt.didCommandTimeout.return:TRUE
+TEST.VALUE:NVDataMgmt.didCommandTimeout.return:MACRO=TRUE
 TEST.VALUE:RTC.<<GLOBAL>>.RTCRAMStatus:RTC_RAM_STATUS_COMPLETE
 TEST.EXPECTED:NVDataMgmt.handleExecVerifyRTCWriteState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC
 TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER.tst
===================================================================
diff -u -r120a51317edc52c160b7917327674af2e403ee5e -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER.tst	(.../INT_SAMPLEWATER.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER.tst	(.../INT_SAMPLEWATER.tst)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -22,8 +22,8 @@
 TEST.SUBPROGRAM:collectTreatmentLogData
 TEST.NEW
 TEST.NAME:getSampleWaterResult
-TEST.VALUE:SampleWater.<<GLOBAL>>.sampleWaterResult:TRUE
-TEST.EXPECTED:ModePostTreat.<<GLOBAL>>.treatmentLogData.waterSampleTestResult:TRUE
+TEST.VALUE:SampleWater.<<GLOBAL>>.sampleWaterResult:MACRO=TRUE
+TEST.EXPECTED:ModePostTreat.<<GLOBAL>>.treatmentLogData.waterSampleTestResult:MACRO=TRUE
 TEST.END
 
 -- Unit: ModePreTreat
@@ -49,7 +49,7 @@
 TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:0
 TEST.VALUE:uut_prototype_stubs.cmdDGSampleWater.cmd:10
 TEST.VALUE:SampleWater.<<GLOBAL>>.currentSampleWaterState:SAMPLE_WATER_COMPLETE_STATE
-TEST.VALUE:SampleWater.<<GLOBAL>>.sampleWaterResult:TRUE
+TEST.VALUE:SampleWater.<<GLOBAL>>.sampleWaterResult:MACRO=TRUE
 TEST.EXPECTED:ModePreTreat.handleWaterSampleState.return:HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE
 TEST.END
 
@@ -60,11 +60,11 @@
 TEST.SUBPROGRAM:initPreTreatmentMode
 TEST.NEW
 TEST.NAME:initSampleWater
-TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterStartRequested:FALSE
-TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterStopRequested:FALSE
-TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterResultEntered:FALSE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterStartRequested:MACRO=FALSE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterStopRequested:MACRO=FALSE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterResultEntered:MACRO=FALSE
 TEST.EXPECTED:SampleWater.<<GLOBAL>>.currentSampleWaterState:SAMPLE_WATER_SETUP_STATE
-TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterResult:FALSE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterResult:MACRO=FALSE
 TEST.END
 
 -- Subprogram: publishPreTreatmentState
@@ -86,7 +86,7 @@
 TEST.SUBPROGRAM:transitionToPreTreatmentMode
 TEST.NEW
 TEST.NAME:transitionToPreTreatmentMode.001
-TEST.VALUE:uut_prototype_stubs.getTestConfigStatus.return:FALSE
+TEST.VALUE:uut_prototype_stubs.getTestConfigStatus.return:MACRO=FALSE
 TEST.EXPECTED:uut_prototype_stubs.cmdDGSampleWater.cmd:SAMPLE_WATER_CMD_FLUSH
 TEST.END
 
Index: vectorcast/Hercules_RM46_HD_Project/environment/PRESOCCL/PRESOCCL.tst
===================================================================
diff -u -r3c83df47e1ceb95e736322f79d85b707fdeac099 -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/PRESOCCL/PRESOCCL.tst	(.../PRESOCCL.tst)	(revision 3c83df47e1ceb95e736322f79d85b707fdeac099)
+++ vectorcast/Hercules_RM46_HD_Project/environment/PRESOCCL/PRESOCCL.tst	(.../PRESOCCL.tst)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -1454,6 +1454,114 @@
 TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_VENOUS_LINE_OCCLUSION
 TEST.END
 
+-- Test Case: checkOcclusions.020
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:checkOcclusions
+TEST.NEW
+TEST.NAME:checkOcclusions.020
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 1
+      (1) if (bpOccl < (2000)) ==> FALSE
+      (2) if ((MODE_TREA) == hdMode) ==> FALSE
+      (3) if ((MODE_PRET) == hdMode && hdSubMode > (HD_PRE_TREATMENT_CART_INSTALL_STATE)) ==> FALSE
+      (4) if ((1) == isPersistentAlarmTriggered(ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, outOfRange)) ==> FALSE
+      (5) if ((MODE_PRET) == getCurrentOperationMode()) ==> FALSE
+      (8) if ((MODE_TREA) == getCurrentOperationMode()) ==> FALSE
+      (11) if (bpOccl <= (5000) + bloodPumpOcclusionAfterCartridgeInstall) ==> FALSE
+      (12) if (isBloodPumpRunning() != (0)) ==> FALSE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.STUB:PresOccl.getMeasuredVenousPressure
+TEST.STUB:PresOccl.getFilteredBloodPumpOccl
+TEST.STUB:PresOccl.getBloodPumpPartialOcclBaseline
+TEST.STUB:PresOccl.getMeasuredBloodPumpOcclusion
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpOcclusion.data:14000
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.VALUE:PresOccl.getMeasuredVenousPressure.return:451.0
+TEST.VALUE:PresOccl.getFilteredBloodPumpOccl.return:14000.0
+TEST.VALUE:PresOccl.getBloodPumpPartialOcclBaseline.return:12000.0
+TEST.VALUE:PresOccl.getMeasuredBloodPumpOcclusion.return:14000
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.getCurrentSubMode.return:<<MIN>>
+TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE,ALARM_ID_HD_OCCLUSION_BLOOD_PUMP,ALARM_ID_HD_PARTIAL_OCCLUSION_BLOOD_PUMP
+TEST.END
+
+-- Test Case: checkOcclusions.021
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:checkOcclusions
+TEST.NEW
+TEST.NAME:checkOcclusions.021
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 1
+      (1) if (bpOccl < (2000)) ==> FALSE
+      (2) if ((MODE_TREA) == hdMode) ==> FALSE
+      (3) if ((MODE_PRET) == hdMode && hdSubMode > (HD_PRE_TREATMENT_CART_INSTALL_STATE)) ==> FALSE
+      (4) if ((1) == isPersistentAlarmTriggered(ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, outOfRange)) ==> FALSE
+      (5) if ((MODE_PRET) == getCurrentOperationMode()) ==> FALSE
+      (8) if ((MODE_TREA) == getCurrentOperationMode()) ==> FALSE
+      (11) if (bpOccl <= (5000) + bloodPumpOcclusionAfterCartridgeInstall) ==> FALSE
+      (12) if (isBloodPumpRunning() != (0)) ==> FALSE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.STUB:PresOccl.getMeasuredVenousPressure
+TEST.STUB:PresOccl.getFilteredBloodPumpOccl
+TEST.STUB:PresOccl.getBloodPumpPartialOcclBaseline
+TEST.STUB:PresOccl.getMeasuredBloodPumpOcclusion
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpOcclusion.data:14000
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABLE
+TEST.VALUE:PresOccl.getMeasuredVenousPressure.return:451.0
+TEST.VALUE:PresOccl.getFilteredBloodPumpOccl.return:12000.0
+TEST.VALUE:PresOccl.getBloodPumpPartialOcclBaseline.return:12000.0
+TEST.VALUE:PresOccl.getMeasuredBloodPumpOcclusion.return:14000
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.getCurrentSubMode.return:<<MIN>>
+TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE,ALARM_ID_HD_OCCLUSION_BLOOD_PUMP
+TEST.END
+
+-- Test Case: checkOcclusions.022
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:checkOcclusions
+TEST.NEW
+TEST.NAME:checkOcclusions.022
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 1
+      (1) if (bpOccl < (2000)) ==> FALSE
+      (2) if ((MODE_TREA) == hdMode) ==> FALSE
+      (3) if ((MODE_PRET) == hdMode && hdSubMode > (HD_PRE_TREATMENT_CART_INSTALL_STATE)) ==> FALSE
+      (4) if ((1) == isPersistentAlarmTriggered(ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, outOfRange)) ==> FALSE
+      (5) if ((MODE_PRET) == getCurrentOperationMode()) ==> FALSE
+      (8) if ((MODE_TREA) == getCurrentOperationMode()) ==> FALSE
+      (11) if (bpOccl <= (5000) + bloodPumpOcclusionAfterCartridgeInstall) ==> FALSE
+      (12) if (isBloodPumpRunning() != (0)) ==> FALSE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.STUB:PresOccl.getMeasuredVenousPressure
+TEST.STUB:PresOccl.getFilteredBloodPumpOccl
+TEST.STUB:PresOccl.getBloodPumpPartialOcclBaseline
+TEST.STUB:PresOccl.getMeasuredBloodPumpOcclusion
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpOcclusion.data:14000
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION
+TEST.VALUE:PresOccl.getMeasuredVenousPressure.return:451.0
+TEST.VALUE:PresOccl.getFilteredBloodPumpOccl.return:12000.0
+TEST.VALUE:PresOccl.getBloodPumpPartialOcclBaseline.return:12000.0
+TEST.VALUE:PresOccl.getMeasuredBloodPumpOcclusion.return:14000
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.getCurrentSubMode.return:<<MIN>>
+TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE,ALARM_ID_HD_OCCLUSION_BLOOD_PUMP
+TEST.END
+
 -- Test Case: checkOcclusions_BP_Occlusion_Out_Of_Range
 TEST.UNIT:PresOccl
 TEST.SUBPROGRAM:checkOcclusions
@@ -3358,6 +3466,182 @@
 TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
 TEST.END
 
+-- Test Case: execPressureLimits.031
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:execPressureLimits
+TEST.NEW
+TEST.NAME:execPressureLimits.031
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 5
+      (1) if (currMode != (MODE_TREA)) ==> FALSE
+      (4) case currPresLimitsState ==> PRESSURE_LIMITS_STATE_IDLE
+      (5) if ((1) == bpRunning) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_NORMAL_STABILIZATION_PERIOD
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRampComplete.return:0
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:0
+TEST.END
+
+-- Test Case: execPressureLimits.032
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:execPressureLimits
+TEST.NEW
+TEST.NAME:execPressureLimits.032
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 5
+      (1) if (currMode != (MODE_TREA)) ==> FALSE
+      (4) case currPresLimitsState ==> PRESSURE_LIMITS_STATE_IDLE
+      (5) if ((1) == bpRunning) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_NORMAL_STABILIZATION_PERIOD
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRampComplete.return:0
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_STOP_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:1
+TEST.END
+
+-- Test Case: execPressureLimits.033
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:execPressureLimits
+TEST.NEW
+TEST.NAME:execPressureLimits.033
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 5
+      (1) if (currMode != (MODE_TREA)) ==> FALSE
+      (4) case currPresLimitsState ==> PRESSURE_LIMITS_STATE_IDLE
+      (5) if ((1) == bpRunning) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_NORMAL_STABILIZATION_PERIOD
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:1
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:18002
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRampComplete.return:0
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:0
+TEST.END
+
+-- Test Case: execPressureLimits.034
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:execPressureLimits
+TEST.NEW
+TEST.NAME:execPressureLimits.034
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 5
+      (1) if (currMode != (MODE_TREA)) ==> FALSE
+      (4) case currPresLimitsState ==> PRESSURE_LIMITS_STATE_IDLE
+      (5) if ((1) == bpRunning) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_NORMAL_STABILIZATION_PERIOD
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:1
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:17900
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRampComplete.return:0
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABILIZATION_2
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:17901
+TEST.END
+
+-- Test Case: execPressureLimits.035
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:execPressureLimits
+TEST.NEW
+TEST.NAME:execPressureLimits.035
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 5
+      (1) if (currMode != (MODE_TREA)) ==> FALSE
+      (4) case currPresLimitsState ==> PRESSURE_LIMITS_STATE_IDLE
+      (5) if ((1) == bpRunning) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABLE
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_NORMAL_STABILIZATION_PERIOD
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:1
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:18000
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRampComplete.return:0
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABLE
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:0
+TEST.END
+
+-- Test Case: execPressureLimits.036
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:execPressureLimits
+TEST.NEW
+TEST.NAME:execPressureLimits.036
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 5
+      (1) if (currMode != (MODE_TREA)) ==> FALSE
+      (4) case currPresLimitsState ==> PRESSURE_LIMITS_STATE_IDLE
+      (5) if ((1) == bpRunning) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABLE
+TEST.VALUE:PresOccl.<<GLOBAL>>.pressureStabilizeTime:USE_NORMAL_STABILIZATION_PERIOD
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdate:1
+TEST.VALUE:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:17000
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRunning.return:1
+TEST.VALUE:uut_prototype_stubs.isBloodPumpRampComplete.return:0
+TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.currPresLimitsState:PRESSURE_LIMITS_STATE_STABLE
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.partialBloodPumpOcclBaselineUpdateTimerCounter:17001
+TEST.END
+
+-- Subprogram: filterBloodPumpOcclReadings
+
+-- Test Case: filterBloodPumpOcclReadings.001
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:filterBloodPumpOcclReadings
+TEST.NEW
+TEST.NAME:filterBloodPumpOcclReadings.001
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpOcclReadingsCount:201
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpOcclReadingsCount:200
+TEST.END
+
+-- Test Case: filterBloodPumpOcclReadings.002
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:filterBloodPumpOcclReadings
+TEST.NEW
+TEST.NAME:filterBloodPumpOcclReadings.002
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpOcclReadingsIdx:199
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpOcclReadingsCount:198
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpOcclReadingsIdx:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpOcclReadingsCount:199
+TEST.END
+
 -- Subprogram: filterInlinePressureReadings
 
 -- Test Case: filterInlinePressureReadings.001
@@ -4127,7 +4411,7 @@
 TEST.EXPECTED:uut_prototype_stubs.broadcastData.msgID:MSG_ID_PRESSURE_OCCLUSION_DATA
 TEST.EXPECTED:uut_prototype_stubs.broadcastData.buffer:COMM_BUFFER_OUT_CAN_HD_BROADCAST
 TEST.EXPECTED:uut_prototype_stubs.broadcastData.dataPtr:""
-TEST.EXPECTED:uut_prototype_stubs.broadcastData.length:40
+TEST.EXPECTED:uut_prototype_stubs.broadcastData.length:48
 TEST.END
 
 -- Subprogram: resetArtVenPressureOffsets
@@ -4462,6 +4746,50 @@
 TEST.EXPECTED:PresOccl.testResetBloodPumpOcclusionOverride.return:0
 TEST.END
 
+-- Subprogram: testResetBloodPumpPartialOcclusionBaselineOverride
+
+-- Test Case: testResetBloodPumpPartialOcclusionBaselineOverride.001
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testResetBloodPumpPartialOcclusionBaselineOverride
+TEST.NEW
+TEST.NAME:testResetBloodPumpPartialOcclusionBaselineOverride.001
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.ovData:0.0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.override:0
+TEST.END
+
+-- Test Case: testResetBloodPumpPartialOcclusionBaselineOverride.002
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testResetBloodPumpPartialOcclusionBaselineOverride
+TEST.NEW
+TEST.NAME:testResetBloodPumpPartialOcclusionBaselineOverride.002
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.ovData:10000.0
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.ovData:10000.0
+TEST.END
+
+-- Subprogram: testResetFilteredBloodPumpOcclusionOverride
+
+-- Test Case: testResetFilteredBloodPumpOcclusionOverride.001
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testResetFilteredBloodPumpOcclusionOverride
+TEST.NEW
+TEST.NAME:testResetFilteredBloodPumpOcclusionOverride.001
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.ovData:0.0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.override:0
+TEST.END
+
+-- Test Case: testResetFilteredBloodPumpOcclusionOverride.002
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testResetFilteredBloodPumpOcclusionOverride
+TEST.NEW
+TEST.NAME:testResetFilteredBloodPumpOcclusionOverride.002
+TEST.VALUE:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.ovData:10000.0
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.ovData:10000.0
+TEST.END
+
 -- Subprogram: testResetPresOcclDataPublishIntervalOverride
 
 -- Test Case: testResetPresOcclDataPublishIntervalOverride_LoggedIn
@@ -4643,6 +4971,52 @@
 TEST.EXPECTED:PresOccl.testSetBloodPumpOcclusionOverride.return:0
 TEST.END
 
+-- Subprogram: testSetBloodPumpPartialOcclusionBaselineOverride
+
+-- Test Case: testSetBloodPumpPartialOcclusionBaselineOverride.001
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testSetBloodPumpPartialOcclusionBaselineOverride
+TEST.NEW
+TEST.NAME:testSetBloodPumpPartialOcclusionBaselineOverride.001
+TEST.VALUE:PresOccl.testSetBloodPumpPartialOcclusionBaselineOverride.value:11111.0
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.ovData:11111.0
+TEST.END
+
+-- Test Case: testSetBloodPumpPartialOcclusionBaselineOverride.002
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testSetBloodPumpPartialOcclusionBaselineOverride
+TEST.NEW
+TEST.NAME:testSetBloodPumpPartialOcclusionBaselineOverride.002
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.override:10
+TEST.VALUE:PresOccl.testSetBloodPumpPartialOcclusionBaselineOverride.value:11111.0
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.bloodPumpPartialOcclusionBaseline.override:10
+TEST.END
+
+-- Subprogram: testSetFilteredBloodPumpOcclusionOverride
+
+-- Test Case: testSetFilteredBloodPumpOcclusionOverride.001
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testSetFilteredBloodPumpOcclusionOverride
+TEST.NEW
+TEST.NAME:testSetFilteredBloodPumpOcclusionOverride.001
+TEST.VALUE:PresOccl.testSetFilteredBloodPumpOcclusionOverride.value:10000.0
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.ovData:10000.0
+TEST.END
+
+-- Test Case: testSetFilteredBloodPumpOcclusionOverride.002
+TEST.UNIT:PresOccl
+TEST.SUBPROGRAM:testSetFilteredBloodPumpOcclusionOverride
+TEST.NEW
+TEST.NAME:testSetFilteredBloodPumpOcclusionOverride.002
+TEST.VALUE:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.ovData:5000.0
+TEST.VALUE:PresOccl.testSetFilteredBloodPumpOcclusionOverride.value:10000.0
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:0
+TEST.EXPECTED:PresOccl.<<GLOBAL>>.filteredBloodPumpOccl.ovData:5000.0
+TEST.END
+
 -- Subprogram: testSetPresOcclDataPublishIntervalOverride
 
 -- Test Case: testSetPresOcclDataPublishIntervalOverride_LoggedIn
Index: vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst
===================================================================
diff -u -r21e16693d7682f32f952a6c888efc0a3658df11e -rc52b3819ee809d95afab1ebfe871091ca0dd5e1a
--- vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst	(.../RESERVOIRS.tst)	(revision 21e16693d7682f32f952a6c888efc0a3658df11e)
+++ vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst	(.../RESERVOIRS.tst)	(revision c52b3819ee809d95afab1ebfe871091ca0dd5e1a)
@@ -626,9 +626,11 @@
 TEST.NEW
 TEST.NAME:handleReservoirMgmtFillState_DoneFilling
 TEST.IMPORT_FAILURES:
-(I) @LINE: 639
+(I) @LINE: 643
     >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 639
+    >>>     >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 645
     >>>     >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary.
     >>> (E) @LINE: 646 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0