Index: vectorcast/Hercules_RM46_HD_Project/environment/PRIME/PRIME.tst
===================================================================
diff -u -r226b9b90b6578ce1e886e8741a02b5fb54ac8063 -r12f36f73c7bbdfa3cfe7f5f3bc485b11b17d6810
--- vectorcast/Hercules_RM46_HD_Project/environment/PRIME/PRIME.tst	(.../PRIME.tst)	(revision 226b9b90b6578ce1e886e8741a02b5fb54ac8063)
+++ vectorcast/Hercules_RM46_HD_Project/environment/PRIME/PRIME.tst	(.../PRIME.tst)	(revision 12f36f73c7bbdfa3cfe7f5f3bc485b11b17d6810)
@@ -81,8 +81,9 @@
     >>>     >>>   Read "HD_PRIME_START_STATE"
     >>>     >>>   Command Ignored
 TEST.END_IMPORT_FAILURES:
-TEST.STUB:Prime.handlePrimeWaitForUserStartState
 TEST.VALUE:Prime.<<GLOBAL>>.currentPrimeState:HD_PRIME_WAIT_FOR_USER_START_STATE
+TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:TRUE
+TEST.EXPECTED:Prime.<<GLOBAL>>.currentPrimeState:HD_PRIME_PAUSE
 TEST.END
 
 -- Test Case: execPrime.003
@@ -582,6 +583,26 @@
 TEST.EXPECTED:Prime.<<GLOBAL>>.primeDialyzerBubbleClearState:PRIME_BUBBLE_CLEAR_PRESSURE_STATE
 TEST.END
 
+-- Test Case: handlePrimeBubbleClear.016
+TEST.UNIT:Prime
+TEST.SUBPROGRAM:handlePrimeBubbleClear
+TEST.NEW
+TEST.NAME:handlePrimeBubbleClear.016
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 9
+      (6) case primeDialyzerBubbleClearState ==> PRIME_BUBBLE_CLEAR_PRESSURE_STATE
+      (8) if (getMeasuredVenousPressure() > (200.0F) || (1) == didTimeout(primeSalineDialyzerBubbleClearStartTime, 10 * 1000)) ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:Prime.<<GLOBAL>>.primeDialyzerBubbleClearState:PRIME_BUBBLE_CLEAR_PRESSURE_STATE
+TEST.VALUE:Prime.<<GLOBAL>>.bubbleClearEnded:1
+TEST.VALUE:uut_prototype_stubs.getMeasuredVenousPressure.return:100.0
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0,1
+TEST.EXPECTED:Prime.<<GLOBAL>>.primeDialyzerBubbleClearState:PRIME_BUBBLE_CLEAR_FLOW_STATE
+TEST.EXPECTED:Prime.<<GLOBAL>>.bubbleClearEnded:0
+TEST.END
+
 -- Subprogram: handlePrimeCircBloodCircuitState
 
 -- Test Case: handlePrimeCircBloodCircuitState.001
@@ -648,6 +669,74 @@
 TEST.EXPECTED:Prime.handlePrimeCircBloodCircuitState.return:HD_PRIME_PAUSE
 TEST.END
 
+-- Test Case: handlePrimeCircBloodCircuitState.004
+TEST.UNIT:Prime
+TEST.SUBPROGRAM:handlePrimeCircBloodCircuitState
+TEST.NEW
+TEST.NAME:handlePrimeCircBloodCircuitState.004
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 6
+      (1) if ((AIR_TRAP_LEVEL_AIR) == getAirTrapLevel(AIR_TRAP_LEVEL_SENSOR_LOWER)) ==> FALSE
+      (2) if ((1) == didTimeout(noAirDetectedStartTime, 20 * 1000)) ==> FALSE
+      (3) if ((1) == doesAlarmStatusIndicateStop()) ==> TRUE
+      Row number 1 forms a pair with Row 2 for Condition #3, subcondition "a".
+         Condition a ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:Prime.handlePrimeCircBloodCircuitState.return:HD_PRIME_PAUSE
+TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:1
+TEST.VALUE:uut_prototype_stubs.getAirTrapLevel.return:AIR_TRAP_LEVEL_AIR
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:Prime.handlePrimeCircBloodCircuitState.return:HD_PRIME_PAUSE
+TEST.END
+
+-- Test Case: handlePrimeCircBloodCircuitState.005
+TEST.UNIT:Prime
+TEST.SUBPROGRAM:handlePrimeCircBloodCircuitState
+TEST.NEW
+TEST.NAME:handlePrimeCircBloodCircuitState.005
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 6
+      (1) if ((AIR_TRAP_LEVEL_AIR) == getAirTrapLevel(AIR_TRAP_LEVEL_SENSOR_LOWER)) ==> FALSE
+      (2) if ((1) == didTimeout(noAirDetectedStartTime, 20 * 1000)) ==> FALSE
+      (3) if ((1) == doesAlarmStatusIndicateStop()) ==> TRUE
+      Row number 1 forms a pair with Row 2 for Condition #3, subcondition "a".
+         Condition a ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:Prime.handlePrimeCircBloodCircuitState.return:HD_PRIME_PAUSE
+TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:1
+TEST.VALUE:uut_prototype_stubs.getAirTrapLevel.return:AIR_TRAP_LEVEL_AIR
+TEST.VALUE:uut_prototype_stubs.getBubbleStatus.return:BUBBLE_NOT_DETECTED
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:Prime.handlePrimeCircBloodCircuitState.return:HD_PRIME_PAUSE
+TEST.END
+
+-- Test Case: handlePrimeCircBloodCircuitState.006
+TEST.UNIT:Prime
+TEST.SUBPROGRAM:handlePrimeCircBloodCircuitState
+TEST.NEW
+TEST.NAME:handlePrimeCircBloodCircuitState.006
+TEST.NOTES:
+This is an automatically generated test case.
+   Test Path 6
+      (1) if ((AIR_TRAP_LEVEL_AIR) == getAirTrapLevel(AIR_TRAP_LEVEL_SENSOR_LOWER)) ==> FALSE
+      (2) if ((1) == didTimeout(noAirDetectedStartTime, 20 * 1000)) ==> FALSE
+      (3) if ((1) == doesAlarmStatusIndicateStop()) ==> TRUE
+      Row number 1 forms a pair with Row 2 for Condition #3, subcondition "a".
+         Condition a ==> TRUE
+   Test Case Generation Notes:
+TEST.END_NOTES:
+TEST.VALUE:Prime.handlePrimeCircBloodCircuitState.return:HD_PRIME_PAUSE
+TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:0
+TEST.VALUE:uut_prototype_stubs.getAirTrapLevel.return:AIR_TRAP_LEVEL_AIR
+TEST.VALUE:uut_prototype_stubs.getBubbleStatus.return:BUBBLE_NOT_DETECTED
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:Prime.handlePrimeCircBloodCircuitState.return:HD_PRIME_SALINE_PURGE_AIR_STATE
+TEST.END
+
 -- Subprogram: handlePrimeDialysateBypassState
 
 -- Test Case: handlePrimeDialysateBypassState.001
@@ -1622,40 +1711,6 @@
 TEST.EXPECTED:Prime.handlePrimeWaitForUserStartState.return:HD_PRIME_WAIT_FOR_USER_START_STATE
 TEST.END
 
--- Test Case: handlePrimeWaitForUserStartState.003
-TEST.UNIT:Prime
-TEST.SUBPROGRAM:handlePrimeWaitForUserStartState
-TEST.NEW
-TEST.NAME:handlePrimeWaitForUserStartState.003
-TEST.BASIS_PATH:1 of 3
-TEST.NOTES:
-This is an automatically generated test case.
-   Test Path 1
-      (1) if ((1) == doesAlarmStatusIndicateStop()) ==> FALSE
-      (2) if ((1) == primeStartRequested) ==> FALSE
-   Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:Prime.<<GLOBAL>>.primeStartRequested:<<MIN>>
-TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:<<MIN>>
-TEST.END
-
--- Test Case: handlePrimeWaitForUserStartState.004
-TEST.UNIT:Prime
-TEST.SUBPROGRAM:handlePrimeWaitForUserStartState
-TEST.NEW
-TEST.NAME:handlePrimeWaitForUserStartState.004
-TEST.BASIS_PATH:2 of 3
-TEST.NOTES:
-This is an automatically generated test case.
-   Test Path 2
-      (1) if ((1) == doesAlarmStatusIndicateStop()) ==> FALSE
-      (2) if ((1) == primeStartRequested) ==> TRUE
-   Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:Prime.<<GLOBAL>>.primeStartRequested:1
-TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:<<MIN>>
-TEST.END
-
 -- Test Case: handlePrimeWaitForUserStartState.005
 TEST.UNIT:Prime
 TEST.SUBPROGRAM:handlePrimeWaitForUserStartState
@@ -1669,6 +1724,7 @@
    Test Case Generation Notes:
 TEST.END_NOTES:
 TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:1
+TEST.EXPECTED:Prime.handlePrimeWaitForUserStartState.return:HD_PRIME_PAUSE
 TEST.END
 
 -- Subprogram: handlePrimeWetSelfTestsState
@@ -1753,6 +1809,9 @@
 TEST.END_IMPORT_FAILURES:
 TEST.STUB:Prime.transitionToPrime
 TEST.VALUE:Prime.<<GLOBAL>>.currentPrimeState:HD_PRIME_SALINE_SETUP_STATE
+TEST.EXPECTED:Prime.<<GLOBAL>>.currentPrimeState:HD_PRIME_WAIT_FOR_USER_START_STATE
+TEST.EXPECTED:Prime.<<GLOBAL>>.currentReservoirMgmtState:PRIME_RESERVOIR_MGMT_START_STATE
+TEST.EXPECTED:Prime.<<GLOBAL>>.bubbleClearEnded:0
 TEST.END
 
 -- Subprogram: purgeAirValvesBloodPumpControl
@@ -1775,11 +1834,17 @@
 TEST.SUBPROGRAM:purgeAirValvesBloodPumpControl
 TEST.NEW
 TEST.NAME:purgeAirValvesBloodPumpControl.002
-TEST.VALUE:Prime.<<GLOBAL>>.primeFirstPurgePass:1
+TEST.IMPORT_FAILURES:
+(E) @LINE: 1778 TEST.VALUE:Prime.<<GLOBAL>>.primeFirstPurgePass:1
+    >>> Unknown parameter/object name primeFirstPurgePass
+    >>> Value Line Error - Command Ignored
+(E) @LINE: 1782 TEST.EXPECTED:Prime.<<GLOBAL>>.primeFirstPurgePass:1
+    >>> Unknown parameter/object name primeFirstPurgePass
+    >>> Value Line Error - Command Ignored
+TEST.END_IMPORT_FAILURES:
 TEST.VALUE:uut_prototype_stubs.setValvePosition.valve:VDI
 TEST.VALUE:uut_prototype_stubs.setValvePosition.position:VALVE_POSITION_C_CLOSE
 TEST.VALUE:uut_prototype_stubs.setValveAirTrap.state:STATE_OPEN
-TEST.EXPECTED:Prime.<<GLOBAL>>.primeFirstPurgePass:1
 TEST.EXPECTED:uut_prototype_stubs.setValvePosition.valve:VDI,VDO,VBA,VBV
 TEST.EXPECTED:uut_prototype_stubs.setValvePosition.position:(3)VALVE_POSITION_C_CLOSE,VALVE_POSITION_B_OPEN
 TEST.EXPECTED:uut_prototype_stubs.setValveAirTrap.state:STATE_OPEN
Index: vectorcast/Hercules_RM46_HD_Project/environment/SELFTESTS/SELFTESTS.tst
===================================================================
diff -u -rc35602b03bcce3ebe7d0ab9bc2532b37b4ae8ccf -r12f36f73c7bbdfa3cfe7f5f3bc485b11b17d6810
--- vectorcast/Hercules_RM46_HD_Project/environment/SELFTESTS/SELFTESTS.tst	(.../SELFTESTS.tst)	(revision c35602b03bcce3ebe7d0ab9bc2532b37b4ae8ccf)
+++ vectorcast/Hercules_RM46_HD_Project/environment/SELFTESTS/SELFTESTS.tst	(.../SELFTESTS.tst)	(revision 12f36f73c7bbdfa3cfe7f5f3bc485b11b17d6810)
@@ -3007,6 +3007,7 @@
 TEST.VALUE:SelfTests.<<GLOBAL>>.havePumpsStartedForNCST:1
 TEST.VALUE:SelfTests.<<GLOBAL>>.pumpHomingRequestedForNCST:1
 TEST.VALUE:uut_prototype_stubs.doesAlarmStatusIndicateStop.return:<<MIN>>
+TEST.EXPECTED:SelfTests.handleNoCartSelfTestPumpsState.return:NO_CART_SELF_TESTS_HOME_IDLE_STATE
 TEST.END
 
 -- Subprogram: handleNoCartSelfTestStoppedState
@@ -5159,24 +5160,6 @@
 TEST.EXPECTED:uut_prototype_stubs.setValvePosition.position:(4)VALVE_POSITION_A_INSERT_EJECT
 TEST.END
 
--- Test Case: setupForSelfTestsStop.003
-TEST.UNIT:SelfTests
-TEST.SUBPROGRAM:setupForSelfTestsStop
-TEST.NEW
-TEST.NAME:setupForSelfTestsStop.003
-TEST.BASIS_PATH:1 of 3
-TEST.NOTES:
-This is an automatically generated test case.
-   Test Path 1
-      (1) if ((1) == isAlarmActive(ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM)) ==> FALSE
-      (2) if ((HD_PRE_TREATMENT_SELF_TEST_DRY_STATE) == getPreTreatmentSubState() && (0) == dryPressureTestsCompleted) ==> FALSE
-   Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:SelfTests.<<GLOBAL>>.dryPressureTestsCompleted:1
-TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:<<MIN>>
-TEST.VALUE:uut_prototype_stubs.getPreTreatmentSubState.return:HD_PRE_TREATMENT_WATER_SAMPLE_STATE
-TEST.END
-
 -- Test Case: setupForSelfTestsStop.004
 TEST.UNIT:SelfTests
 TEST.SUBPROGRAM:setupForSelfTestsStop
@@ -5193,26 +5176,9 @@
 TEST.VALUE:SelfTests.<<GLOBAL>>.dryPressureTestsCompleted:0
 TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:<<MIN>>
 TEST.VALUE:uut_prototype_stubs.getPreTreatmentSubState.return:HD_PRE_TREATMENT_SELF_TEST_DRY_STATE
+TEST.EXPECTED:uut_prototype_stubs.setValveAirTrap.state:STATE_OPEN
 TEST.END
 
--- Test Case: setupForSelfTestsStop.005
-TEST.UNIT:SelfTests
-TEST.SUBPROGRAM:setupForSelfTestsStop
-TEST.NEW
-TEST.NAME:setupForSelfTestsStop.005
-TEST.BASIS_PATH:3 of 3
-TEST.NOTES:
-This is an automatically generated test case.
-   Test Path 3
-      (1) if ((1) == isAlarmActive(ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM)) ==> TRUE
-      (2) if ((HD_PRE_TREATMENT_SELF_TEST_DRY_STATE) == getPreTreatmentSubState() && (0) == dryPressureTestsCompleted) ==> FALSE
-   Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:SelfTests.<<GLOBAL>>.dryPressureTestsCompleted:1
-TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:1
-TEST.VALUE:uut_prototype_stubs.getPreTreatmentSubState.return:HD_PRE_TREATMENT_WATER_SAMPLE_STATE
-TEST.END
-
 -- Test Case: setupForSelfTestsStop.006
 TEST.UNIT:SelfTests
 TEST.SUBPROGRAM:setupForSelfTestsStop
@@ -5228,6 +5194,7 @@
 TEST.VALUE:SelfTests.<<GLOBAL>>.dryPressureTestsCompleted:1
 TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:<<MIN>>
 TEST.VALUE:uut_prototype_stubs.getPreTreatmentSubState.return:HD_PRE_TREATMENT_SELF_TEST_DRY_STATE
+TEST.EXPECTED:uut_prototype_stubs.setValveAirTrap.state:STATE_CLOSED
 TEST.END
 
 -- Subprogram: signalResumeSelfTests