Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r27f3db92495948d4c1192421c1b0c20338c4a034 -rbb80dbac26147ab08413efa91007f7ffed43c38f
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision bb80dbac26147ab08413efa91007f7ffed43c38f)
@@ -118,8 +118,6 @@
 
 static void handleDrySelfTestsStopRequest( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestWaitForDoorCloseState( void );
-static DRY_SELF_TESTS_STATE_T handleDrySelfTestBubbleDetectorsState( void );
-static DRY_SELF_TESTS_STATE_T handleDrySelfTestAirTrapState( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsSetupState( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( SELF_TEST_STATUS_T *result );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsNormalState( SELF_TEST_STATUS_T *result );
@@ -284,10 +282,10 @@
 
         case NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE:
             // TODO: Implement self tests
-            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_DOOR_SWITCH_STATE;
+            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_HOMING_STATE;
             break;
 
-        case NO_CART_SELF_TESTS_DOOR_SWITCH_STATE:
+        case NO_CART_SELF_TESTS_START_HOMING_STATE:
             // TODO: Implement self tests
             currentNoCartSelfTestsState = NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE;
             break;
@@ -386,14 +384,6 @@
             currentDrySelfTestsState = handleDrySelfTestWaitForDoorCloseState();
             break;
 
-        case DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE:
-            currentDrySelfTestsState = handleDrySelfTestBubbleDetectorsState();
-            break;
-
-        case DRY_SELF_TESTS_AIR_TRAP_STATE:
-            currentDrySelfTestsState = handleDrySelfTestAirTrapState();
-            break;
-
         case DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE:
             if ( SELF_TEST_STATUS_PASSED == execPresOcclDryTest() )
             {
@@ -740,60 +730,8 @@
 
     if ( STATE_CLOSED == getFPGADoorState() )
     {
-        state = DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE;
-    }
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleDrySelfTestBubbleDetectorsState function verify no fluid is detected
- * by bubble detectors.
- * @details Inputs: none
- * @details Outputs: none
- * @return the next state of dry self-tests state machine
- *************************************************************************/
-static DRY_SELF_TESTS_STATE_T handleDrySelfTestBubbleDetectorsState( void )
-{
-    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE;
-
-    BOOL const isADADetectedAir = getFPGAArterialAirBubbleStatus();
-    BOOL const isADVDetectedAir = getFPGAVenousAirBubbleStatus();
-
-    if ( ( TRUE == isADADetectedAir ) && ( TRUE == isADVDetectedAir ) )
-    {
-        state = DRY_SELF_TESTS_AIR_TRAP_STATE;
-    }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleDrySelfTestAirTrapState function verify no fluid is detected
- * by air trap.
- * @details Inputs: none
- * @details Outputs: none
- * @return the next state of dry self-tests state machine
- *************************************************************************/
-static DRY_SELF_TESTS_STATE_T handleDrySelfTestAirTrapState( void )
-{
-    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_AIR_TRAP_STATE;
-
-    if ( ( 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 );
-    }
 
     return state;
 }