Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1df7543c35187ec875bda3c9276709f023c7332c -r23389626f10f9e841c185c189ef16ac3939d549c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1df7543c35187ec875bda3c9276709f023c7332c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 23389626f10f9e841c185c189ef16ac3939d549c)
@@ -43,16 +43,19 @@
 #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 BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 5 * MS_PER_SECOND )                   ///< Pressure self-test time to run blood pump in ms.
+#define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 12 * MS_PER_SECOND )                  ///< Pressure self-test time to run blood pump in ms.
+#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.
 #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          -75.0F                                  ///< Arterial pressure low limit after running blood pump.
-#define VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG            35.0F                                  ///< Venous pressure high limit after running blood pump.
+#define ARTERIAL_DECAY_PRESSURE_DIFF_TOLERANCE_MMHG         5.0F                                    ///< Difference in arterial pressure readings after the pump stops (in mmHg).
+#define VENOUS_DECAY_PRESSURE_DIFF_TOLERANCE_MMHG           10.0F                                   ///< Difference in venous pressure readings after the pump stops (in mmHg).
+#define ARTERIAL_STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG     4.0F                                    ///< Difference in arterial pressure readings while in a stable pressured state (in mmHg).
+#define VENOUS_STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG       8.0F                                    ///< Difference in venous 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 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           80.0F                                   ///< Venous pressure high limit after running blood pump.
+
 #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.
@@ -1044,7 +1047,8 @@
         arterialDecayDiff = fabs( arterialPressure - peakArterialPressure );
         venousDecayDiff = fabs( venousPressure - peakVenousPressure );
 
-        if (arterialDecayDiff < DECAY_PRESSURE_DIFF_TOLERANCE_MMHG && venousDecayDiff < DECAY_PRESSURE_DIFF_TOLERANCE_MMHG)
+        if ( ( arterialDecayDiff < ARTERIAL_DECAY_PRESSURE_DIFF_TOLERANCE_MMHG ) &&
+           ( venousDecayDiff < VENOUS_DECAY_PRESSURE_DIFF_TOLERANCE_MMHG ) )
         {
             decayedArterialPressure = arterialPressure;
             decayedVenousPressure = venousPressure;
@@ -1086,7 +1090,8 @@
         arterialStabilityDiff = fabs( getFilteredArterialPressure() - decayedArterialPressure );
         venousStabilityDiff = fabs( getFilteredVenousPressure() - decayedVenousPressure );
 
-        if (arterialStabilityDiff < STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG && venousStabilityDiff < STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG)
+        if ( ( arterialStabilityDiff < ARTERIAL_STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG ) &&
+             ( venousStabilityDiff < VENOUS_STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG ) )
         {
             pressureSelfTestNormalizedStartTime = getMSTimerCount();
             setValvePosition( VBV, VALVE_POSITION_B_OPEN );