Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -reea25dc85d5dc793ad24a72481b00f5493c4c26a -r1356b53e15457e2df35a5260e3f6dc86fdc50b11
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision eea25dc85d5dc793ad24a72481b00f5493c4c26a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1356b53e15457e2df35a5260e3f6dc86fdc50b11)
@@ -42,10 +42,10 @@
 #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 BLOOD_PUMP_PRESSURE_SELF_TEST_FLOW                  100
-#define DIAL_IN_PUMP_PRESSURE_SELF_TEST_FLOW                350
+#define DIAL_IN_PUMP_PRESSURE_SELF_TEST_FLOW                300
 #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              ( 12 * MS_PER_SECOND )                  ///< Pressure self-test time to run blood pump in ms.
+#define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 20 * MS_PER_SECOND )                  ///< Pressure self-test time to run blood pump in ms.
 #define DIAL_IN_PUMP_RUN_TIME_PRESSURE_SELF_TEST            ( 20 * MS_PER_SECOND )
 #define DECAY_PRESSURE_SELF_TEST_TIME                       ( 4 * MS_PER_SECOND )                   ///< time to wait for pressure to decay in ms.
 #define STABILTY_PRESSURE_SELF_TEST_TIME                    ( 5 * MS_PER_SECOND )                   ///< Time to wait for pressure to stabilize in ms.
@@ -58,7 +58,7 @@
 
 #define ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG          -200.0F                                 ///< Arterial pressure low limit after running blood pump.
 #define VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG           200.0F                                   ///< Venous pressure high limit after running blood pump.
-#define VENOUS_PRESSURE_SELF_TEST_FIRST_PASS_LIMIT_MMHG     160.0F                                  ///< Venous pressure high limit after running dpi in first test.
+#define VENOUS_PRESSURE_SELF_TEST_FIRST_PASS_LIMIT_MMHG     180.0F                                  ///< Venous pressure high limit after running dpi in first test.
 
 #define NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG                 10.0F                                   ///< Difference in pressure readings after return to normal state tolerance (in mmHg).
 
@@ -1022,14 +1022,13 @@
     F32 const venousPressure = getFilteredVenousPressure();
 
     // End the test when reaching target pressure or time out
-    if ( ( TRUE == didTimeout( pressureSelfTestDialInPumpRunStartTime, DIAL_IN_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) ) ||
-         ( VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG <= venousPressure ) )
+    if ( VENOUS_PRESSURE_SELF_TEST_FIRST_PASS_LIMIT_MMHG <= venousPressure )
     {
         signalDialInPumpHardStop();
         state = DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE;
     }
 
-    else
+    if ( TRUE == didTimeout( pressureSelfTestDialInPumpRunStartTime, DIAL_IN_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) )
     {
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG );
     }
@@ -1091,17 +1090,18 @@
     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 ) ) )
+    // Test pass when reading positive arterial pressure and negative venous pressure
+    if ( ( ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG >= arterialPressure ) && ( VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG <= venousPressure ) )
     {
         peakVenousPressure = venousPressure;
         peakArterialPressure = arterialPressure;
         signalBloodPumpHardStop();
+
         pressureSelfTestDecayStartTime = getMSTimerCount();
         state = DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE;
     }
 
-    else
+    if ( TRUE == didTimeout( pressureSelfTestBloodPumpRunStartTime, BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) )
     {
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, arterialPressure );
     }