Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6df491d298cef30e312b930e9d3b4e81ce0ec946 -rd9c2c8e146f20a2acefb9ac1f6497536fb2c404e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6df491d298cef30e312b930e9d3b4e81ce0ec946)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d9c2c8e146f20a2acefb9ac1f6497536fb2c404e)
@@ -4540,24 +4540,31 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestDGSetReleaseSoftwareConfig function handles a request
- * to set the release software configuration.
+ * The handleTestDGSetTestConfig function handles a request to set the
+ * test configuration.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestDGSetReleaseSoftwareConfig( MESSAGE_T *message )
+void handleTestDGSetTestConfig( MESSAGE_T *message )
 {
     BOOL status = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    if ( message->hdr.payloadLen == sizeof( TEST_CONFIG_PAYLOAD_T ) )
     {
-        U32 payload;
+        TEST_CONFIG_PAYLOAD_T payload;
 
-        memcpy( &payload, message->payload, sizeof( U32 ) );
+        memcpy( &payload, message->payload, sizeof( TEST_CONFIG_PAYLOAD_T ) );
 
-        status = setReleaseSoftwareConfig( (RELEASE_SOFTWARE_CONFIG_T)payload );
+        if ( TRUE == payload.reset )
+        {
+            status = resetTestConfig( payload.config );
+        }
+        else
+        {
+            status = setTestConfig( payload.config );
+        }
     }
 
     // Respond to request