Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r0a939033abdc46f55464eaae234b9a30ad95caea -r1e80e279a08e1915ff6e2e57a728e5a278ee67a3
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 0a939033abdc46f55464eaae234b9a30ad95caea)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1e80e279a08e1915ff6e2e57a728e5a278ee67a3)
@@ -1031,13 +1031,15 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsDecayState( void )
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE;
-    F32 const arterialDecayDiff = 0;
-    F32 const venousDecayDiff =  0;
+    F32 const arterialPressure = getFilteredArterialPressure();
+    F32 const venousPressure = getFilteredVenousPressure();
+    F32 arterialDecayDiff = 0;
+    F32 venousDecayDiff =  0;
 
     if ( ( TRUE == didTimeout( pressureSelfTestDecayStartTime, DECAY_PRESSURE_SELF_TEST_TIME ) ) )
     {
-        arterialDecayDiff = fabs( getFilteredArterialPressure() - peakArterialPressure );
-        venousDecayDiff = fabs( getFilteredVenousPressure() - peakVenousPressure );
+        arterialDecayDiff = fabs( arterialPressure - peakArterialPressure );
+        venousDecayDiff = fabs( venousPressure - peakVenousPressure );
 
         if (arterialDecayDiff < DECAY_PRESSURE_DIFF_TOLERANCE_MMHG && venousDecayDiff < DECAY_PRESSURE_DIFF_TOLERANCE_MMHG)
         {
@@ -1048,7 +1050,7 @@
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialPressure, venousPressure );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialDecayDiff, venousDecayDiff );
         }
     }
 
@@ -1073,15 +1075,15 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsStabilityState( void )
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE;
-    F32 const arterialPressure = 0;
-    F32 const venousPressure = 0;
+    F32 arterialStabilityDiff = 0;
+    F32 venousStabilityDiff = 0;
 
     if ( ( TRUE == didTimeout( pressureSelfTestStabilityStartTime, DECAY_PRESSURE_SELF_TEST_TIME ) ) )
     {
-        arterialDecayDiff = fabs( getFilteredArterialPressure() - peakArterialPressure );
-        venousDecayDiff = fabs( getFilteredVenousPressure() - peakVenousPressure );
+        arterialStabilityDiff = fabs( getFilteredArterialPressure() - peakArterialPressure );
+        venousStabilityDiff = fabs( getFilteredVenousPressure() - peakVenousPressure );
 
-        if (arterialDecayDiff < STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG && venousDecayDiff < STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG)
+        if (arterialStabilityDiff < STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG && venousStabilityDiff < STABILITY_PRESSURE_DIFF_TOLERANCE_MMHG)
         {
             pressureSelfTestNormalizedStartTime = getMSTimerCount();
             setValvePosition( VBV, VALVE_POSITION_B_OPEN );
@@ -1090,7 +1092,7 @@
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialPressure, venousPressure );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, arterialStabilityDiff, venousStabilityDiff );
         }
     }