Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3d30c9829d316b8c5e632c0201a59c8d14b3486e -reb64545b0bddac878e5d930272c6c8068bb4089a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3d30c9829d316b8c5e632c0201a59c8d14b3486e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision eb64545b0bddac878e5d930272c6c8068bb4089a)
@@ -1917,15 +1917,15 @@
 
 /***********************************************************************//**
  * @brief
- * The broadcastBloodLeakData function constructs an HD blood leak data msg to \n
+ * The broadcastBubblesData function constructs an HD air bubble data msg to \n
  * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
- * @details Outputs: blood leak data msg constructed and queued
- * @param status blood leak status
- * @param state blood leak state
+ * @details Outputs: air bubbles data msg constructed and queued
+ * @param status air bubbles status
+ * @param state air bubbles states
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastBubblesData( BUBBLE_STATUS_T statusADA, U32 stateADA, BUBBLE_STATUS_T statusADV, U32 stateADV )
+BOOL broadcastBubblesData( U32 statusADA, U32 stateADA, U32 statusADV, U32 stateADV )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -5032,9 +5032,9 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         result = TRUE;
         selfTestBubble( (BUBBLES_T)payload.index );
     }