Index: TestSupport.h
===================================================================
diff -u -r08afa6b76832639a7c9d327be99d6f236f84cb68 -r36f96b1e7a43e0947ff10e3c6947d80e37152d9c
--- TestSupport.h	(.../TestSupport.h)	(revision 08afa6b76832639a7c9d327be99d6f236f84cb68)
+++ TestSupport.h	(.../TestSupport.h)	(revision 36f96b1e7a43e0947ff10e3c6947d80e37152d9c)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    TestSupport.h
 *
-* @author  (last)      Sean
-* @date    (last)      30-Jul-2024
+* @author  (last)      Vinayakam Mani
+* @date    (last)      16-Sep-2025
 *
-* @author  (original)  Sean
-* @date    (original)  30-Jul-2024
+* @author  (original)  Sean Nash
+* @date    (original)  01-Aug-2024
 *
 ***************************************************************************/
 
@@ -50,10 +50,8 @@
 /// DD test software configurations
 typedef enum test_Config_enums
 {
-    TEST_CONFIG_BETA_HW = 0,                                    ///< Test configuration using Beta HW
-    TEST_CONFIG_FIRST = TEST_CONFIG_BETA_HW,                    ///< Test configuration first configuration.
-    TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS,                     ///< Test configuration disabling BC pressure alarms
-    TEST_CONFIG_DISABLE_DIENER_CONC_PUMP,                       ///< Test configuration disabling Diener concentrate pump
+    TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS = 0,                 ///< Test configuration disabling BC pressure alarms
+    TEST_CONFIG_FIRST = TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS, ///< Test configuration first configuration.
     NUM_OF_TEST_CONFIGS                                         ///< Number of test configuration.
 } TEST_CONFIG_T;
 #endif
@@ -67,16 +65,6 @@
 } TEST_CONFIG_T;
 #endif
 
-#ifdef _RO_
-/// FP test software configurations
-typedef enum test_Config_enums
-{
-    TEST_CONFIG_BETA_HW = 0,                                    ///< Test configuration using Beta HW
-    TEST_CONFIG_FIRST = TEST_CONFIG_BETA_HW,                    ///< Test configuration first configuration.
-    NUM_OF_TEST_CONFIGS = 1,                                    ///< Number of test configuration.
-} TEST_CONFIG_T;
-#endif
-
 #pragma pack(push,1)
 
 /// Test configuration payload