Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa -rd62cad9611841e592b4b46b1170e4beb57c1d153
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d62cad9611841e592b4b46b1170e4beb57c1d153)
@@ -359,11 +359,11 @@
 
             data.timeout   = MAX_NO_CARTRIDGE_SELF_TEST_TIME;
             data.countdown = ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
+            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -517,7 +517,7 @@
 
         data.timeout   = MAX_DRY_SELF_TEST_TIME;
         data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-        broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
+        broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
     }
 }