Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -re63c54262fd4ccd8ffd9ef9bb49e66458893528f -r44a100f8e5210a02c23b8fcc4527d8e96d577381
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e63c54262fd4ccd8ffd9ef9bb49e66458893528f)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
@@ -18,6 +18,7 @@
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "BloodLeak.h"
+#include "Bubble.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
@@ -74,6 +75,7 @@
 {
     WET_SELF_TESTS_START_STATE = 0,                         ///< Wet self-tests starting state.
     WET_SELF_TESTS_SETUP_STATE,                             ///< Setup reservoirs for wet self-tests.
+    WET_SELF_TESTS_BUBBLES_STATE,                           ///< Wet self-test air bubble detectors state.
     WET_SELF_TESTS_PRIME_CHECK_STATE,                       ///< Prime check wet self-tests state, checks for primed patient lines.
     WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE,               ///< Blood leak detector self-test state.
     WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE,          ///< Setup valve and start dialysate pump for first displacement.
@@ -137,6 +139,7 @@
 
 static WET_SELF_TESTS_STATE_T handleWetSelfTestStartState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestSetupState( void );
+static WET_SELF_TESTS_STATE_T handleWetSelfTestBubblesState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestPrimeCheckState( SELF_TEST_STATUS_T *result );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestBloodLeakDetectorState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestFirstDisplacementSetupState( void );
@@ -212,10 +215,10 @@
 void transitionToNoCartSelfTests( void )
 {
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
 #ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) );
+    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
 #else
     useHeparin = FALSE;
 #endif
@@ -341,14 +344,6 @@
  *************************************************************************/
 void transitionToDrySelfTests()
 {
-    F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-
-#ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) );
-#else
-    useHeparin = FALSE;
-#endif
     currentDrySelfTestsState = DRY_SELF_TESTS_START_STATE;
     pressureSelfTestBloodPumpRunStartTime = 0;
     pressureSelfTestNormalizedStartTime = 0;
@@ -513,6 +508,10 @@
             currentWetSelfTestsState = handleWetSelfTestSetupState();
             break;
 
+        case WET_SELF_TESTS_BUBBLES_STATE:
+            currentWetSelfTestsState = handleWetSelfTestBubblesState();
+            break;
+
         case WET_SELF_TESTS_PRIME_CHECK_STATE:
             currentWetSelfTestsState = handleWetSelfTestPrimeCheckState( &result );
             break;
@@ -650,7 +649,7 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( ( FALSE == isSyringePumpHome() ) && ( TRUE == isSyringePumpStopped() ) )
+        if ( TRUE == isSyringePumpStopped() )
         {
             retractSyringePump();
         }
@@ -800,11 +799,10 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
 
-    // TODO: Use appropriate sensor driver
-    BOOL const isADADetectedAir = getFPGAArterialAirBubbleStatus();
-    BOOL const isADVDetectedAir = getFPGAVenousAirBubbleStatus();
+    BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA );
+    BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-    if ( ( TRUE == isADADetectedAir ) && ( TRUE == isADVDetectedAir ) &&
+    if ( ( BUBBLE_DETECTED == ADABubbleStatus ) && ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
     {
@@ -1078,6 +1076,34 @@
     if ( setupDisplacementVolume <= 0 )
     {
         signalDialInPumpHardStop();
+        selfTestBubble( ADA );
+        selfTestBubble( ADV );
+        state = WET_SELF_TESTS_BUBBLES_STATE;
+    }
+
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        state = WET_SELF_TESTS_STOPPED_STATE;
+        setupForSelfTestsStop();
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleWetSelfTestBubblesState function waiting for air bubble detectors
+ * self-tests to finish.
+ * @details Inputs: bubbleSelfTestStatus
+ * @details Outputs: none
+ * @return the next state of wet self-tests state machine
+ *************************************************************************/
+static WET_SELF_TESTS_STATE_T handleWetSelfTestBubblesState( void )
+{
+    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLES_STATE;
+
+    if ( ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADA ) ) && ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) ) )
+    {
         state = WET_SELF_TESTS_PRIME_CHECK_STATE;
     }
 
@@ -1104,12 +1130,11 @@
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_PRIME_CHECK_STATE;
     *result = SELF_TEST_STATUS_FAILED;
 
-    // TODO: Use appropriate sensor driver
-    BOOL const isADADetectedAir = getFPGAArterialAirBubbleStatus();
-    BOOL const isADVDetectedAir = getFPGAVenousAirBubbleStatus();
+    BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA );
+    BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
 #ifndef SKIP_AIR_BUBBLE_CHECK
-    if ( ( FALSE == isADADetectedAir ) && ( FALSE == isADVDetectedAir ) )
+    if ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) )
 #endif
     {
         zeroBloodLeak();
@@ -1128,7 +1153,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleWetSelfTestBloodLeakDetectorState function handles zeoring and
+ * The handleWetSelfTestBloodLeakDetectorState function handles zeroing and
  * self-test for blood leak detector.
  * @details Inputs: none
  * @details Outputs: next self-test state