Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rb20421d84b9049977c04f4752f4fc5697425f25c -r9a96522e0a94724a13c2c9c8f60cf8d18ebde218
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b20421d84b9049977c04f4752f4fc5697425f25c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9a96522e0a94724a13c2c9c8f60cf8d18ebde218)
@@ -41,18 +41,18 @@
 
 #define PUMP_RUN_SELF_TEST_TIME_MS                          ( 15 * MS_PER_SECOND )                  ///< Self-test time to run pumps in ms.
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
-#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 3 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
+#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
 
 #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                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
 #define STABILTY_PRESSURE_SELF_TEST_TIME                    ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to stabilize in ms.
 #define DECAY_PRESSURE_SELF_TEST_TIME                       ( 2 * MS_PER_SECOND )                   ///< time to wait for pressure to decay in ms.
 
-#define ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG          -50.0F                                  ///< 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 ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG          -80.0F                                  ///< Arterial pressure low limit after running blood pump.
+#define VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG            40.0F                                  ///< Venous pressure high limit after running blood pump.
 
-#define DECAY_PRESSURE_DIFF_TOLERANCE_MMHG                  5.0F                                   ///< Difference in pressure readings after the pump stops (in mmHg).
-#define STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG              2.0F                                   ///< Difference in pressure readings while in a stable pressured state (in mmHg).
+#define DECAY_PRESSURE_DIFF_TOLERANCE_MMHG                  5.0F                                    ///< Difference in pressure readings after the pump stops (in mmHg).
+#define STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG              2.0F                                    ///< Difference in pressure readings while in a stable pressured state (in mmHg).
 #define NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG                 10.0F                                   ///< 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.
@@ -340,7 +340,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -907,10 +907,10 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -1026,6 +1026,18 @@
     F32 arterialDecayDiff = 0;
     F32 venousDecayDiff =  0;
 
+    // update peak pressure value from pressurized state
+    // if pressure continues to increase due to filter lag
+    if (arterialPressure > peakArterialPressure )
+    {
+        peakArterialPressure = arterialPressure;
+    }
+
+    if ( venousPressure > peakVenousPressure )
+    {
+        peakVenousPressure = venousPressure;
+    }
+
     if ( ( TRUE == didTimeout( pressureSelfTestDecayStartTime, DECAY_PRESSURE_SELF_TEST_TIME ) ) )
     {
         arterialDecayDiff = fabs( arterialPressure - peakArterialPressure );
@@ -1044,7 +1056,6 @@
         }
     }
 
-
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         state = DRY_SELF_TESTS_STOPPED_STATE;
@@ -1152,8 +1163,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
+                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 1 second has elapsed
                     state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
-                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
                 }
                 else
                 {
@@ -1382,22 +1393,21 @@
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestPrimeCheckState( void )
 {
-    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_PRIME_CHECK_STATE;
+    WET_SELF_TESTS_STATE_T state    = WET_SELF_TESTS_PRIME_CHECK_STATE;
+    BUBBLE_STATUS_T ADVBubbleStatus = getBubbleStatus( ADV );
 
-    BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
-
     if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
 #ifndef _RELEASE_
-        // TODO do we need both of these?
         if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) &&
              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK ) != SW_CONFIG_ENABLE_VALUE ) )
 #endif
         {
-            zeroBloodLeak();
+            if ( TRUE == zeroBloodLeak() )
+            {
+                state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+            }
         }
-
-        state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
     }
     else
     {