Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rae5ed7d669400cff089ab54b8fe77a391f8ad194 -r25a6eff69c9371f7a320751adf5359aaf070e5b0
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ae5ed7d669400cff089ab54b8fe77a391f8ad194)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 25a6eff69c9371f7a320751adf5359aaf070e5b0)
@@ -347,7 +347,12 @@
  *************************************************************************/
 static F32 calcBloodFlow( void )
 {
+#ifndef PBA_ESTIMATION
     F32 artPres = getLongFilteredArterialPressure();
+#else
+    // TODO - temporary test code - remove later
+    F32 artPres = -200.0;
+#endif
     F32 rotSpd  = filteredBloodPumpSpeed / BP_GEAR_RATIO;
     U32 r       = getBloodPumpRotorCount();
     U32 rotCnt  = CAP( r, BP_MAX_ROTOR_COUNT_FOR_WEAR );
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r25a6eff69c9371f7a320751adf5359aaf070e5b0
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 25a6eff69c9371f7a320751adf5359aaf070e5b0)
@@ -363,15 +363,7 @@
         // Check for stale arterial pressure reading
         if ( FALSE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, ( lastArterialPressureReadCtr == artReadCtr || artErrorCtr > 0 ) ) )
         {
-#ifndef PBA_ESTIMATION
             arterialPressure.data = ARTERIAL_PRESSURE_V_PER_BIT * ( (F32)(artPres) / ( ARTERIAL_PRESSURE_SENSITIVITY * ARTERIAL_PRESSURE_V_BIAS ) ) + getF32OverrideValue( &arterialPressureOffset );
-#else
-            // TODO - temporary test code - remove later
-            F32 artPres = -0.1146 * getMeasuredBloodPumpMCSpeed();
-            artPres = MAX(-200.0,artPres);
-            artPres = MIN(0,artPres);
-            arterialPressure.data = artPres;
-#endif
         }
         else
         {
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rdee324600666944baf72278ea33b8775b87a0a0e -r25a6eff69c9371f7a320751adf5359aaf070e5b0
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision dee324600666944baf72278ea33b8775b87a0a0e)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 25a6eff69c9371f7a320751adf5359aaf070e5b0)
@@ -43,7 +43,7 @@
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
 
 #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                  ( 2 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
+#define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
 
 #define ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG          -50.0                                   ///< 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.
@@ -58,7 +58,7 @@
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100.0                                   ///< Target of first displacement volume in ml.
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0                                   ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           5.0                                     ///< Tolerance on integrated volume in percentage.
-#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              1.5                                     ///< Tolerance in the load cell readings of the displacement in grams.
+#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              12.0                                    ///< Tolerance in the load cell readings of the displacement in grams (2%).
 #define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
 #define RESERVOIR_SETTLE_TIME_MS                            ( 4 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.