Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r26d736280fef713e7639cd2b98eed975e2eb4353 -r4efd42acbcbde896a1e9e532db77a72bebea0bdc
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 26d736280fef713e7639cd2b98eed975e2eb4353)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4efd42acbcbde896a1e9e532db77a72bebea0bdc)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -43,12 +43,12 @@
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
 
 #define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 5 * MS_PER_SECOND )                   ///< Pressure self-test time to run blood pump in ms.
-#define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 2 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
+#define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
 
 #define ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG          -50.0                                   ///< Arterial pressure low limit after running blood pump.
 #define VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG           400                                     ///< Venous pressure high limit after running blood pump.
 
-#define NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG                 5.0                                     ///< Difference in pressure readings after return to normal state tolerance (in mmHg).
+#define NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG                 10.0                                    ///< Difference in pressure readings after return to normal state tolerance (in mmHg).
 
 #define DIP_FLOW_RATE_SETUP_ML_MIN                          150                                     ///< Dialysate inlet pump flow rate during the setup for wet self-test.
 #define DIP_FLOW_RATE_FIRST_DISPLACEMENT_ML_MIN             100                                     ///< Dialysate inlet pump flow rate during the first displacement in wet self-test.
@@ -58,7 +58,7 @@
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100.0                                   ///< Target of first displacement volume in ml.
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0                                   ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           5.0                                     ///< Tolerance on integrated volume in percentage.
-#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              1.5                                     ///< Tolerance in the load cell readings of the displacement in grams.
+#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              12.0                                    ///< Tolerance in the load cell readings of the displacement in grams (2%).
 #define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
 #define RESERVOIR_SETTLE_TIME_MS                            ( 4 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.
 
@@ -487,6 +487,7 @@
 void transitionToWetSelfTests()
 {
     F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+    signalDialInPumpHardStop();   // turn off DPi that was on in previous dialysate bypass state
     wetSelfTestsResult = FALSE;
     currentWetSelfTestsState = WET_SELF_TESTS_START_STATE;
     settleStartTime = 0;
@@ -828,10 +829,9 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
 
-    BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA );
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-    if ( ( BUBBLE_DETECTED == ADABubbleStatus ) && ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
+    if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
     {
@@ -979,21 +979,31 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( TRUE == isSyringePlungerFound() )
+        if ( FALSE == isSyringePumpRunning() )
         {
-            if ( TRUE == isSyringePumpPrimed() )
+            if ( TRUE == isSyringePlungerFound() )
             {
-                state = DRY_SELF_TESTS_COMPLETE_STATE;
+                if ( TRUE == isSyringePumpPrimed() )
+                {
+                    state = DRY_SELF_TESTS_COMPLETE_STATE;
+                }
+                else
+                {
+                    primeSyringePump();
+                }
             }
             else
             {
-                primeSyringePump();
+                if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
+                {
+                    retractSyringePump();
+                }
+                else if ( TRUE == isSyringePumpHome() )
+                {
+                    seekSyringePlunger();
+                }
             }
         }
-        else
-        {
-            seekSyringePlunger();
-        }
     }
     else
     {
@@ -1108,7 +1118,6 @@
     if ( setupDisplacementVolume <= 0 )
     {
         signalDialInPumpHardStop();
-        selfTestBubble( ADA );
         selfTestBubble( ADV );
         state = WET_SELF_TESTS_BUBBLES_STATE;
     }
@@ -1134,7 +1143,7 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLES_STATE;
 
-    if ( ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADA ) ) && ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) ) )
+    if ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) )
     {
         state = WET_SELF_TESTS_PRIME_CHECK_STATE;
     }
@@ -1162,7 +1171,6 @@
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_PRIME_CHECK_STATE;
     *result = SELF_TEST_STATUS_FAILED;
 
-    BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA );
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
 #ifndef SKIP_AIR_BUBBLE_CHECK