Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r6df491d298cef30e312b930e9d3b4e81ce0ec946 -rd9c2c8e146f20a2acefb9ac1f6497536fb2c404e
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 6df491d298cef30e312b930e9d3b4e81ce0ec946)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision d9c2c8e146f20a2acefb9ac1f6497536fb2c404e)
@@ -667,7 +667,7 @@
         }
 #endif
 
-        if ( ( TRUE == isConductivityInRange ) || ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
+        if ( ( TRUE == isConductivityInRange ) || ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
         {
             // Initialization
             requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
@@ -739,7 +739,7 @@
 #endif
         {
             if ( ( TRUE == isValueWithinPercentRange( averageAcidConductivity, acidCondUSPerCM, FIVE_PERCENT_FACTOR ) ) ||
-                 ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
+                 ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
             {
                 hasAcidTestPassed = TRUE;
             }
@@ -748,7 +748,7 @@
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE, averageAcidConductivity )
             }
 
-            if ( ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) || ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
+            if ( ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) || ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
             {
                 hasCD1CD2TestPassed = TRUE;
             }
@@ -934,7 +934,7 @@
                 F32 avgCPo = sumFillCPoConductivity / (F32)fillCPoConductivitySampleCnt;  // sample count incremented above w/o condition so no need for divide by zero checks
                 F32 avgRR  = sumFillRejRatio / (F32)fillCPoConductivitySampleCnt;
 
-                if ( ( avgCPo > MAX_CPO_CONDUCTIVITY_ALLOW ) || ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
+                if ( ( avgCPo > MAX_CPO_CONDUCTIVITY_ALLOW ) || ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
                 {
                     // Fault alarm per PRS 483
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, avgCPo, MAX_CPO_CONDUCTIVITY_ALLOW );
@@ -965,7 +965,7 @@
         {
             // SRSDG 400
             if ( ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, bicarbNormalConductivity, FIVE_PERCENT_FACTOR ) ) ||
-                 ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
+                 ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
@@ -975,7 +975,7 @@
             }
 
             if ( ( FALSE == isValueWithinPercentRange( avgAcidConductivity, acidNormalConductivity, FIVE_PERCENT_FACTOR ) ) ||
-                 ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ))
+                 ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ))
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6df491d298cef30e312b930e9d3b4e81ce0ec946 -rd9c2c8e146f20a2acefb9ac1f6497536fb2c404e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6df491d298cef30e312b930e9d3b4e81ce0ec946)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d9c2c8e146f20a2acefb9ac1f6497536fb2c404e)
@@ -1304,8 +1304,8 @@
                 handleTestDGSetDialysateMixingRatios( message );
                 break;
 
-            case MSG_ID_DG_SET_RELEASE_SOFTWARE_CONFIGURATION:
-                handleTestDGSetReleaseSoftwareConfig( message );
+            case MSG_ID_DG_SET_TEST_CONFIGURATION:
+                handleTestDGSetTestConfig( message );
                 break;
 
             default:
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
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r6df491d298cef30e312b930e9d3b4e81ce0ec946 -rd9c2c8e146f20a2acefb9ac1f6497536fb2c404e
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6df491d298cef30e312b930e9d3b4e81ce0ec946)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d9c2c8e146f20a2acefb9ac1f6497536fb2c404e)
@@ -475,8 +475,8 @@
 // MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS
 void handleTestDGSetDialysateMixingRatios( MESSAGE_T *message );
 
-// MSG_ID_DG_SET_RELEASE_SOFTWARE_CONFIGURATION
-void handleTestDGSetReleaseSoftwareConfig( MESSAGE_T *message );
+// MSG_ID_DG_SET_TEST_CONFIGURATION
+void handleTestDGSetTestConfig( MESSAGE_T *message );
 
 /**@}*/
 
Index: firmware/source/sys_main.c
===================================================================
diff -u -r6df491d298cef30e312b930e9d3b4e81ce0ec946 -rd9c2c8e146f20a2acefb9ac1f6497536fb2c404e
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 6df491d298cef30e312b930e9d3b4e81ce0ec946)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision d9c2c8e146f20a2acefb9ac1f6497536fb2c404e)
@@ -205,7 +205,7 @@
     initFluidLeak();
     initOperationModes();
     initIntegrity();
-    initReleaseSoftwareConfigs();
+    initTestConfigs();
 }
 
 /*************************************************************************