Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r6d392942d8e7286a4748398a2359b7bd519f870a -rc366736831f616177368f6198a35924e489e9169
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6d392942d8e7286a4748398a2359b7bd519f870a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c366736831f616177368f6198a35924e489e9169)
@@ -979,8 +979,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 )
@@ -990,15 +992,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;
@@ -1024,8 +1025,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 )
@@ -1068,8 +1072,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 )