Index: firmware/App/HDCommon.h
===================================================================
diff -u -r645a316a9cda57a4d7561080add53dd12bbe4770 -rdd9e3bea402ef6957991d91c0e5cbd5db61cd33a
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 645a316a9cda57a4d7561080add53dd12bbe4770)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision dd9e3bea402ef6957991d91c0e5cbd5db61cd33a)
@@ -10,8 +10,8 @@
 * @author  (last)      Sean Nash
 * @date    (last)      12-Nov-2021
 *
-* @author  (original)  Sean
-* @date    (original)  27-Feb-2020
+* @author  (original) Sean
+* @date    (original) 27-Feb-2020
 *
 ***************************************************************************/
 
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        6
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        0
+#define HD_VERSION_BUILD        124
 
 // ********** development build switches **********
 
@@ -54,13 +54,13 @@
     #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
     #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
     #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
-    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
+//    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
-//    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
-    #define SKIP_CAL_CHECK               1
+    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
+    #define SKIP_CAL_CHECK                  1           //
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
@@ -75,9 +75,12 @@
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
-//    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
+    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 //    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts
+    #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
+    #define DISABLE_ILLEGAL_AIR_TRAP_ALARM  1           // Disable illegal state for air trap alarm
+//    #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
 
     // Skip Pre-Treatment and get to treatment as soon as possible
 //    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r76a5589f5a6d68bcb35379c9977a50a57056b299 -rdd9e3bea402ef6957991d91c0e5cbd5db61cd33a
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 76a5589f5a6d68bcb35379c9977a50a57056b299)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision dd9e3bea402ef6957991d91c0e5cbd5db61cd33a)
@@ -826,16 +826,16 @@
     BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA );
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-    if ( ( BUBBLE_DETECTED == ADABubbleStatus ) && ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
-         ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
-         ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
-    {
+//    if ( ( BUBBLE_DETECTED == ADABubbleStatus ) && ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
+//         ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
+//         ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
+//    {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
-    }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {