Index: TestSupport.c
===================================================================
diff -u -re53564e90120fd06942205c23d95259ad66bf1d0 -r9d99536cc13313e6d88baf50905707404142c09e
--- TestSupport.c	(.../TestSupport.c)	(revision e53564e90120fd06942205c23d95259ad66bf1d0)
+++ TestSupport.c	(.../TestSupport.c)	(revision 9d99536cc13313e6d88baf50905707404142c09e)
@@ -246,30 +246,33 @@
  *************************************************************************/
 BOOL sendTestConfigStatusToDialin( void )
 {
-    BOOL result;
+    BOOL result = FALSE;
     MESSAGE_T msg;
     TEST_CONFIG_T config;
     U32 configStatus = 0;
     U08 *payloadPtr = msg.payload;
 
-    // Create a message record
-    blankMessage( &msg );
+    if ( TRUE == isTestingActivated() )
+    {
+        // Create a message record
+        blankMessage( &msg );
 #ifdef _DG_
-    msg.hdr.msgID = MSG_ID_DG_SEND_TEST_CONFIGURATION;
+        msg.hdr.msgID = MSG_ID_DG_SEND_TEST_CONFIGURATION;
 #endif
-    msg.hdr.payloadLen = sizeof( testConfig );
+        msg.hdr.payloadLen = sizeof( testConfig );
 
-    for ( config = TEST_CONFIG_ENABLE_MIXING_WITH_WATER; config < NUM_OF_TEST_CONFIGS; ++config )
-    {
-        configStatus = (U32)getTestConfigStatus( config );
+        for ( config = TEST_CONFIG_ENABLE_MIXING_WITH_WATER; config < NUM_OF_TEST_CONFIGS; ++config )
+        {
+            configStatus = (U32)getTestConfigStatus( config );
 
-        memcpy( payloadPtr, &configStatus, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
+            memcpy( payloadPtr, &configStatus, sizeof( U32 ) );
+            payloadPtr += sizeof( U32 );
+        }
+
+        // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+        result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED );
     }
 
-    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED );
-
     return result;
 }
 
@@ -314,13 +317,13 @@
 
 /*********************************************************************//**
  * @brief
- * The hasDialinCheckInBeenExpired function checks whether the check in from
- * dialin has been expired or not.
+ * The hasDialinCheckInExpired function checks whether the check in from
+ * dialin has expired or not.
  * @details Inputs: none
  * @details Outputs: dialinCheckInTimeStamp
  * @return TRUE if the check in has been expired otherwise, FALSE
  *************************************************************************/
-BOOL hasDialinCheckInBeenExpired( void )
+BOOL hasDialinCheckInExpired( void )
 {
     BOOL status = FALSE;
 
Index: TestSupport.h
===================================================================
diff -u -re53564e90120fd06942205c23d95259ad66bf1d0 -r9d99536cc13313e6d88baf50905707404142c09e
--- TestSupport.h	(.../TestSupport.h)	(revision e53564e90120fd06942205c23d95259ad66bf1d0)
+++ TestSupport.h	(.../TestSupport.h)	(revision 9d99536cc13313e6d88baf50905707404142c09e)
@@ -128,7 +128,7 @@
 BOOL resetAllTestConfigs( void );
 
 void setDialinCheckInTimeStamp( void );
-BOOL hasDialinCheckInBeenExpired( void );
+BOOL hasDialinCheckInExpired( void );
 
 /**@}*/