Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r13700bb1d05322c1c0437957b072a0a7e1834639 -rbd18adf4e83f7a618d11e70b4fc9daedf17fabdc
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 13700bb1d05322c1c0437957b072a0a7e1834639)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision bd18adf4e83f7a618d11e70b4fc9daedf17fabdc)
@@ -35,8 +35,7 @@
 
 /// Interval (ms/task time) at which the air trap data is published on the CAN bus.
 #define AIR_TRAP_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
-#define AIR_PUMP_UPPER_LEVEL_PERSISTENCE    ( 100 / TASK_GENERAL_INTERVAL )
-
+#define AIR_PUMP_UPPER_LEVEL_PERSISTENCE    ( 100 / TASK_GENERAL_INTERVAL )                     ///< Persistence time for air pump operation after air trap upper level reads air.
 /// Persistence period for illegal level sensors fault.
 static const U32 AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE = ( MS_PER_SECOND * 2 / TASK_GENERAL_INTERVAL );
 static const U32 AIR_TRAP_UPPER_LEVEL_PERSISTENCE = ( MS_PER_SECOND * 2 / TASK_GENERAL_INTERVAL );
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r464b5fb48c50c0b46fa352cb887379fd973bf956 -rbd18adf4e83f7a618d11e70b4fc9daedf17fabdc
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 464b5fb48c50c0b46fa352cb887379fd973bf956)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision bd18adf4e83f7a618d11e70b4fc9daedf17fabdc)
@@ -1007,6 +1007,7 @@
             }
         }
         else
+#endif
         {
             // TODO - wait 1 sec before taking pressure readings and beginning pressure check
             previousNormalArterialPressure = getFilteredArterialPressure();
@@ -1019,7 +1020,7 @@
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
             }
         }
-#endif
+
     }
 
     return state;