Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r2c7eb0a12e3189d745eec91880fea7c59fbd64ab -rbd0f27a6b6430cc62fe69d43f272fd89366eb048
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 2c7eb0a12e3189d745eec91880fea7c59fbd64ab)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision bd0f27a6b6430cc62fe69d43f272fd89366eb048)
@@ -928,14 +928,14 @@
         previousNormalVenousPressure = getFilteredVenousPressure();
 
         // Check to see if sensor is within normal ranges before we execute pressure sensor tests
-        if (previousNormalArterialPressure <= NORMAL_PRESSURE_LOWER_BOUNDARY || previousNormalArterialPressure >= NORMAL_PRESSURE_UPPER_BOUNDARY )
+        if ( previousNormalArterialPressure <= NORMAL_PRESSURE_LOWER_BOUNDARY || previousNormalArterialPressure >= NORMAL_PRESSURE_UPPER_BOUNDARY )
         {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, previousNormalArterialPressure );
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure );
         }
 
-        if (previousNormalVenousPressure <= NORMAL_PRESSURE_LOWER_BOUNDARY || previousNormalVenousPressure >= NORMAL_PRESSURE_UPPER_BOUNDARY )
+        if ( previousNormalVenousPressure <= NORMAL_PRESSURE_LOWER_BOUNDARY || previousNormalVenousPressure >= NORMAL_PRESSURE_UPPER_BOUNDARY )
         {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, previousNormalVenousPressure );
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalVenousPressure );
         }
 
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
@@ -966,7 +966,7 @@
 
     // 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 ) )
+       ( ( ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG >= arterialPressure ) && ( VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG <= venousPressure ) ) )
     {
         signalBloodPumpHardStop();
         // Test pass when reading positive arterial pressure and negative venous pressure