Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r2991b6731ff88740f29ea2f19411115d4f8a4aa4 -r80a6638b362f5f613c0665200023d181f614d1bc
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 2991b6731ff88740f29ea2f19411115d4f8a4aa4)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 80a6638b362f5f613c0665200023d181f614d1bc)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Bill Bracken
-* @date    (last)      22-Aug-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      07-Sep-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -48,11 +48,11 @@
 #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.
@@ -965,8 +965,10 @@
  * @brief
  * The handleDrySelfTestPressureSensorsState function tests the readings of
  * pressure sensors and verify they are in correct range.
- * @details Inputs: none
- * @details Outputs: none
+ * @details Inputs: peakArterialPressure, peakVenousPressure,
+ * pressureSelfTestDecayStartTime
+ * @details Outputs: peakArterialPressure, peakVenousPressure,
+ * pressureSelfTestDecayStartTime
  * @return the next state of dry self-tests state machine
  *************************************************************************/
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( void )
@@ -976,15 +978,14 @@
     F32 const venousPressure = getFilteredVenousPressure();
 
     // End the test when reaching target pressure or time out
-    if ( ( TRUE == didTimeout( pressureSelfTestBloodPumpRunStartTime, BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) ) ||
-       ( ( ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG >= arterialPressure ) && ( VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG <= venousPressure ) ) )
+    if ( TRUE == didTimeout( pressureSelfTestBloodPumpRunStartTime, BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) )
     {
         peakArterialPressure = arterialPressure;
         peakVenousPressure = venousPressure;
 
         signalBloodPumpHardStop();
         // Test pass when reading positive arterial pressure and negative venous pressure
-        if ( ( arterialPressure < 0) && ( venousPressure > 0 ) )
+        if ( ( ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG >= arterialPressure ) && ( VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG <= venousPressure ) )
         {
             pressureSelfTestDecayStartTime = getMSTimerCount();
             state = DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE;
@@ -1010,8 +1011,11 @@
  * the readings of pressure sensors after we have verified the sensors
  * are in the correct range by observing the loss in pressure once
  * the pump has stopped.
- * @details Inputs: none
- * @details Outputs: none
+ * @details Inputs: decayedArterialPressure, decayedVenousPressure,
+ * pressureSelfTestStabilityStartTime, peakArterialPressure,
+ * peakVenousPressure
+ * @details Outputs: decayedArterialPressure, decayedVenousPressure
+ * pressureSelfTestStabilityStartTime
  * @return the next state of dry self-tests state machine
  *************************************************************************/
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsDecayState( void )
@@ -1022,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 );
@@ -1040,7 +1056,6 @@
         }
     }
 
-
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         state = DRY_SELF_TESTS_STOPPED_STATE;
@@ -1054,8 +1069,9 @@
  * @brief
  * The handleDrySelfTestPressureSensorsStabilityState function verifies the readings of
  * pressure sensors in a stable, pressurized state after decay has been observed.
- * @details Inputs: none
- * @details Outputs: none
+ * @details Inputs: pressureSelfTestNormalizedStartTime, decayedArterialPressure
+ * decayedVenousPressure
+ * @details Outputs: pressureSelfTestNormalizedStartTime
  * @return the next state of dry self-tests state machine
  *************************************************************************/
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsStabilityState( void )