Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf7cdfd3256f195cd8aa06e28009cd5f26b50f08c -rbfcdc37808b6d3b400358ef05f7c495178ea0f21
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f7cdfd3256f195cd8aa06e28009cd5f26b50f08c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision bfcdc37808b6d3b400358ef05f7c495178ea0f21)
@@ -822,15 +822,14 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
 
-    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 == 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 );
@@ -1102,7 +1101,6 @@
     if ( setupDisplacementVolume <= 0 )
     {
         signalDialInPumpHardStop();
-        selfTestBubble( ADA );
         selfTestBubble( ADV );
         state = WET_SELF_TESTS_BUBBLES_STATE;
     }
@@ -1128,7 +1126,7 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLES_STATE;
 
-    if ( ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADA ) ) && ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) ) )
+    if ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) )
     {
         state = WET_SELF_TESTS_PRIME_CHECK_STATE;
     }
@@ -1156,7 +1154,6 @@
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_PRIME_CHECK_STATE;
     *result = SELF_TEST_STATUS_FAILED;
 
-    BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA );
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
 #ifndef SKIP_AIR_BUBBLE_CHECK