Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r108a0285f895e26bb037f3472bb05962ea3c4941 -r9feea867113c62088f0ce91750127972dbd9bf53
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 108a0285f895e26bb037f3472bb05962ea3c4941)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
@@ -293,8 +293,7 @@
             break;
 
         default:
-            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_NO_CARTRIDGE_SELF_TEST_STATE, (U32)currentNoCartSelfTestsState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_NO_CARTRIDGE_SELF_TEST_STATE, currentNoCartSelfTestsState );
             break;
     }
 
@@ -420,8 +419,7 @@
             break;
 
         default:
-            currentDrySelfTestsState = DRY_SELF_TESTS_START_STATE;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_DRY_SELF_TEST_STATE, (U32)currentDrySelfTestsState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_DRY_SELF_TEST_STATE, currentDrySelfTestsState );
             break;
     }
 
@@ -540,8 +538,7 @@
             break;
 
         default:
-            currentWetSelfTestsState = WET_SELF_TESTS_START_STATE;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_WET_SELF_TEST_STATE, (U32)currentWetSelfTestsState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_WET_SELF_TEST_STATE, currentWetSelfTestsState );
             break;
     }