Index: NVMgmt.h
===================================================================
diff -u -reed05c4b7fb5648a8b599286fc2bbcfbce9259ff -r4e082c5cf56513443b5e72f6f938433823d55a28
--- NVMgmt.h	(.../NVMgmt.h)	(revision eed05c4b7fb5648a8b599286fc2bbcfbce9259ff)
+++ NVMgmt.h	(.../NVMgmt.h)	(revision 4e082c5cf56513443b5e72f6f938433823d55a28)
@@ -12,9 +12,10 @@
 *
 ***************************************************************************/
 
-#ifndef _NV_MGMT_DD_H_
-#define _NV_MGMT_DD_H_
+#ifndef _NV_MGMT_H_
+#define _NV_MGMT_H_
 
+#include "Common.h"
 #include "AlarmDefs.h"
 #include "NVRecordsDD.h"
 
@@ -46,4 +47,4 @@
 SELF_TEST_STATUS_T execNVMSelfTest( void );
 /**@}*/
 
-#endif /* _NV_MGMT_DD_H_ */
+#endif /* _NV_MGMT_H_ */
Index: TestSupport.h
===================================================================
diff -u -rdeb9e732e94019f4a33d51067386c9ba80e17959 -r4e082c5cf56513443b5e72f6f938433823d55a28
--- TestSupport.h	(.../TestSupport.h)	(revision deb9e732e94019f4a33d51067386c9ba80e17959)
+++ TestSupport.h	(.../TestSupport.h)	(revision 4e082c5cf56513443b5e72f6f938433823d55a28)
@@ -7,8 +7,8 @@
 *
 * @file    TestSupport.h
 *
-* @author  (last)      Praneeth Bunne
-* @date    (last)      13-Mar-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      16-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -52,19 +52,22 @@
 {
     TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW = 0,                 ///< Test configuration DD & FP enable Beta 1.0 hardware
     TEST_CONFIG_FIRST = TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW, ///< Test configuration first configuration.
-    TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW,                     ///< Test configuration for DD & FP to enable Beta 2.0 hardware
+    TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW,                     ///< Test configuration for DD & FP to enable Beta 2.0 hardware
     TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS,                ///< Test configuration DD disabling BC pressure alarms
-    TEST_CONFIG_DD_ENABLE_DRY_BICARB,                         ///< Test configuration DD to use dry bicarb
+    TEST_CONFIG_DD_DISABLE_DRY_BICARB,                        ///< Test configuration DD to disable dry bicarb
     TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH,                        ///< Test configuration FP skip pre-gen flush
     TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP,                   ///< Test configuration to use diener 2000 pump for D48
     TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL,               ///< Test configuration DD enable spent chamber H fill
     TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS,               ///< Test configuration to disable DD conductivity alarms
     TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS,               ///< Test configuration to disable FP conductivity alarms
     TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL,           ///< Test configuration to switch to open loop control for concentrate dosing
-    TEST_CONFIG_DD_ENABLE_UF_TEMP_COMPENSATION,               ///< Test configuration for enabling UF temperature compensation
-    TEST_CONFIG_DD_DRY_BICART_TEST,                           ///< Test configuration DD to test initial fill , drain and initial chamber fill in pre-gen
+    TEST_CONFIG_DD_DISABLE_UF_TEMP_COMPENSATION,              ///< Test configuration for disabling UF temperature compensation
+    TEST_CONFIG_DD_ENABLE_WCID_1,                             ///< Test configuration DD to enable WCID_1(for beta 1.9 and 2.0)
     TEST_CONFIG_DD_RUN_SOLO,                                  ///< Test configuration to run DD alone without the need of other subsystems
     TEST_CONFIG_FP_DISABLE_RO_CURRENT_ALARMS,                 ///< Test configuration to disable RO current alarms.
+    TEST_CONFIG_FP_ENABLE_BOOST_PUMP,                         ///< Test configuration FP to enable P40 boost pump
+    TEST_CONFIG_FP_ENABLE_DEFEATURE,                          ///< Test configuration FP to set sub system as defeatured
+    TEST_CONFIG_DD_FP_DISABLE_CONDUCTIVITY_SENSOR_CHECKS,     ///< Test configuration to disable conductivity sensor cal checks
     TEST_CONFIG_DISABLE_CAPS_MONITOR,                         ///< Test configuration to disable cap monitor.
     TEST_CONFIG_DISABLE_VOLTAGES_ALARMS,                      ///< Test configuration to disable voltages alarms.
     TEST_CONFIG_DISABLE_ALARM_AUDIO,                          ///< Test configuration to disable alarm audio.
@@ -80,6 +83,7 @@
     TEST_CONFIG_FIRST = TEST_CONFIG_ENABLE_BETA_1_HW,           ///< Test configuration first configuration.
     TEST_CONFIG_SKIP_BLOOD_PRIME,                               ///< Test configuration skip blood prime
     TEST_CONFIG_TESTING_WITHOUT_TUBING_SET,                     ///< Test configuration for testing without tubing set.
+    TEST_CONFIG_ENABLE_SYRINGE_PUMP_TESTING,                    ///< Test configuration to skip checks in syringe pump during testing
     NUM_OF_TEST_CONFIGS                                         ///< Number of test configuration.
 } TEST_CONFIG_T;
 #endif