Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r1243f0acb8aff0805d36efae022c1378bf92389e -r6a690d6e8c05de2de703d9f2f07176821e5eb6b0
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1243f0acb8aff0805d36efae022c1378bf92389e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6a690d6e8c05de2de703d9f2f07176821e5eb6b0)
@@ -1548,7 +1548,7 @@
                 break;
 
             case MSG_ID_HD_BUBBLES_SELF_TEST_REQUEST:
-                handleBubblesSelfTestRequest( message );
+                handleBubbleSelfTestRequest( message );
                 break;
 
             case MSG_ID_HD_SET_OP_MODE_REQUEST:
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8cfb168cdf03558cd271b3a6e9d3f7a545a25f9d -r6a690d6e8c05de2de703d9f2f07176821e5eb6b0
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8cfb168cdf03558cd271b3a6e9d3f7a545a25f9d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6a690d6e8c05de2de703d9f2f07176821e5eb6b0)
@@ -5019,22 +5019,22 @@
 
 /*********************************************************************//**
  * @brief
- * The handleBubblesSelfTestRequest function handles a request to
- * self-test the air bubble detector.
+ * The handleBubbleSelfTestRequest function handles a request to
+ * self-test a given air bubble detector.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleBubblesSelfTestRequest( MESSAGE_T *message )
+void handleBubbleSelfTestRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    U32 payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( U32 ) );
         result = TRUE;
         selfTestBubble( (BUBBLES_T)payload.index );
     }
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -reb64545b0bddac878e5d930272c6c8068bb4089a -r6a690d6e8c05de2de703d9f2f07176821e5eb6b0
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision eb64545b0bddac878e5d930272c6c8068bb4089a)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6a690d6e8c05de2de703d9f2f07176821e5eb6b0)
@@ -574,7 +574,7 @@
 void handleSetBubblesStatusOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_HD_BUBBLES_SELF_TEST_REQUEST
-void handleBubblesSelfTestRequest( MESSAGE_T *message );
+void handleBubbleSelfTestRequest( MESSAGE_T *message );
 
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );