Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rac4879487648b014902895a813bedda2d6df7b7f -r01875def462c74a2ec96a13e9eeca87addad852d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ac4879487648b014902895a813bedda2d6df7b7f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 01875def462c74a2ec96a13e9eeca87addad852d)
@@ -496,7 +496,7 @@
                     // if message from HD broadcast channel, update HD comm status
                     if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == MSG_IN_BUFFERS[ i ] )
                     {
-                        hdCommunicationStatus.data = TRUE;
+                        hdCommunicationStatus.data = (U32)TRUE;
                         timeOfLastHDCheckIn = getMSTimerCount();
                     }
                 }
@@ -1172,13 +1172,14 @@
  * @details Outputs: hdCommunicationStatus
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
-BOOL testSetHDCommunicationStatus( void )
+BOOL testSetHDCommunicationStatus( U32 value )
 {
     BOOL result = FALSE;
-    if(TRUE == isTestingActivated() )
+
+    if (TRUE == isTestingActivated() )
     {
         result = TRUE;
-        hdCommunicationStatus.ovData = TRUE;
+        hdCommunicationStatus.ovData = value;
         hdCommunicationStatus.override = OVERRIDE_KEY;
 
     }
@@ -1196,7 +1197,8 @@
 BOOL testResetHDCommuncationStatus( void )
 {
     BOOL result = FALSE;
-    if(TRUE == isTestingActivated() )
+
+    if (TRUE == isTestingActivated() )
     {
         result = TRUE;
         hdCommunicationStatus.override = OVERRIDE_RESET;
@@ -1205,4 +1207,5 @@
     }
     return result;
 }
+
 /**@}*/
Index: firmware/App/Services/SystemComm.h
===================================================================
diff -u -r2c5f0db65f23016a42f3e28160c308336f2b108e -r01875def462c74a2ec96a13e9eeca87addad852d
--- firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 2c5f0db65f23016a42f3e28160c308336f2b108e)
+++ firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 01875def462c74a2ec96a13e9eeca87addad852d)
@@ -55,8 +55,9 @@
 BOOL isHDCommunicating( void );
 BOOL isDGOnlyCANNode( void );
 BOOL addMsgToPendingACKList( MESSAGE_T *msg, COMM_BUFFER_T channel, U08 *msgData, U32 len );
-BOOL testSetHDCommunicationStatus( void );                                                      ///< HD Communication Override Set
-BOOL testResetHDCommuncationStatus( void );                                                     ///< HD Communication Override Reset
+BOOL testSetHDCommunicationStatus( void );
+BOOL testResetHDCommuncationStatus( void );
+
 /**@}*/
 
 #endif
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rfa8082956bc1d94cdd7b2375053a4f35e3159f43 -r01875def462c74a2ec96a13e9eeca87addad852d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fa8082956bc1d94cdd7b2375053a4f35e3159f43)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 01875def462c74a2ec96a13e9eeca87addad852d)
@@ -3219,13 +3219,12 @@
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( BOOL ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-
-        memcpy( &payload.reset, message->payload, sizeof( BOOL ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetHDCommunicationStatus();
+            result = testSetHDCommunicationStatus(payload.state.u32);
         }
         else
         {
@@ -3236,4 +3235,5 @@
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
+
 /**@}*/