Index: firmware/App/HDCommon.h
===================================================================
diff -u -re890c1ece95d6f044f81651272849c471c7803ab -r7850b0981d2ce5057ecb0885530ab8ddbeaf335b
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision e890c1ece95d6f044f81651272849c471c7803ab)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 7850b0981d2ce5057ecb0885530ab8ddbeaf335b)
@@ -55,7 +55,7 @@
     #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_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
@@ -80,12 +80,12 @@
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
     // Skip Pre-Treatment and get to treatment as soon as possible
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
-    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
-    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
-    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
-    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
+//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+//    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+//    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
+//    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
+//    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+//    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 
     #include <stdio.h>
     #include <strings.h>
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r358e32a9fb25a6929fc5bbd7ee1d8ed2c4b69920 -r7850b0981d2ce5057ecb0885530ab8ddbeaf335b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 358e32a9fb25a6929fc5bbd7ee1d8ed2c4b69920)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7850b0981d2ce5057ecb0885530ab8ddbeaf335b)
@@ -825,16 +825,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() )
     {