Index: TestSupport.h
===================================================================
diff -u -r9f8f3bc0cab51c1d6934de69cc4d1f974d3a1a53 -r21f8f1d1ab4bfd0592c8744528a65f98d6b8a4c4
--- TestSupport.h	(.../TestSupport.h)	(revision 9f8f3bc0cab51c1d6934de69cc4d1f974d3a1a53)
+++ TestSupport.h	(.../TestSupport.h)	(revision 21f8f1d1ab4bfd0592c8744528a65f98d6b8a4c4)
@@ -31,15 +31,22 @@
 #define OVERRIDE_KEY    0xCCC33C33          ///< Override key
 #define OVERRIDE_RESET  0x00000000          ///< Override reset
 
-/// Release software configurations
-typedef enum release_software_Config
+/// Test software configurations
+typedef enum test_Config
 {
-    RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER = 0,  ///< Release software configuration enable mixing with water.
-    NUM_OF_RELEASE_SW_CONFIGS                        ///< Number of release software configuration.
-} RELEASE_SOFTWARE_CONFIG_T;
+    TEST_CONFIG_ENABLE_MIXING_WITH_WATER = 0,  ///< Test configuration enable mixing with water.
+    NUM_OF_TEST_CONFIGS                        ///< Number of test configuration.
+} TEST_CONFIG_T;
 
 #pragma pack(push,1)
 
+/// Test configuration payload
+typedef struct
+{
+    TEST_CONFIG_T config;                       ///< Test configuration.
+    BOOL reset;                                 ///< Test configuration reset.
+} TEST_CONFIG_PAYLOAD_T ;
+
 /// Test override payload type union.
 typedef union
 {
@@ -99,9 +106,10 @@
 S32 getS32OverrideValue( OVERRIDE_S32_T *ovS32 );
 F32 getF32OverrideValue( OVERRIDE_F32_T *ovF32 );
 
-void initReleaseSoftwareConfigs( void );
-BOOL setReleaseSoftwareConfig( RELEASE_SOFTWARE_CONFIG_T config );
-BOOL getReleaseSoftwareConfigStatus( RELEASE_SOFTWARE_CONFIG_T config );
+void initTestConfigs( void );
+BOOL setTestConfig( TEST_CONFIG_T config );
+BOOL resetTestConfig( TEST_CONFIG_T config );
+BOOL getTestConfigStatus( TEST_CONFIG_T config );
 
 /**@}*/