Index: PersistentAlarm.h
===================================================================
diff -u -r0a352b8c0078d35e21eb27e5a032bc6cf68bc47d -reacf3d951deb19beec7fa334f5fca28e39ae9243
--- PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 0a352b8c0078d35e21eb27e5a032bc6cf68bc47d)
+++ PersistentAlarm.h	(.../PersistentAlarm.h)	(revision eacf3d951deb19beec7fa334f5fca28e39ae9243)
@@ -7,8 +7,8 @@
 *
 * @file    PersistentAlarm.h
 *
-* @author  (last)      “Raghu
-* @date    (last)      10-Sep-2025
+* @author  (last)      Michael Garthwaite
+* @date    (last)      07-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -48,6 +48,8 @@
     FPGA_PERS_ERROR_D43_COND_SENSOR,                            ///< CD4 Conductivity sensor.
     FPGA_PERS_ERROR_RTD_ADC_TEMP_SENSORS,                       ///< Temperature sensors.
     FPGA_PERS_ERROR_D74_COND_SENSOR,                            ///< D74 Conductivty sensor.
+    FPGA_PERS_ERROR_P9_COND_SENSOR,                             ///< P9 Conductivity sensor.
+    FPGA_PERS_ERROR_P18_COND_SENSOR,                            ///< P18 Conducitivty sensor.
     NUM_OF_FPGA_SENSOR_GROUPS                                   ///< Number of FPGA sensor groups.
 } FPGA_PERSISTENT_ALARMS_GROUP_T;
 #endif
Index: TestSupport.h
===================================================================
diff -u -r2661636ad00f13b668e460946c1b8c5cbe0d7b71 -reacf3d951deb19beec7fa334f5fca28e39ae9243
--- TestSupport.h	(.../TestSupport.h)	(revision 2661636ad00f13b668e460946c1b8c5cbe0d7b71)
+++ TestSupport.h	(.../TestSupport.h)	(revision eacf3d951deb19beec7fa334f5fca28e39ae9243)
@@ -7,8 +7,8 @@
 *
 * @file    TestSupport.h
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      10-Feb-2026
+* @author  (last)      Michael Garthwaite
+* @date    (last)      07-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -52,18 +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_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_ENABLE_D79_PWM_CONTROL,                    ///< Test configuration to switch to PWM control for D79
     TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH,                        ///< Test configuration FP skip pre-gen flush
-    TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP,                   ///< Test configuration to use diener 1000 pump for D48
+    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_DISABLE_UF_TEMP_COMPENSATION,              ///< Test configuration for disabling 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_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
     NUM_OF_TEST_CONFIGS                                       ///< Number of test configuration.
 } TEST_CONFIG_T;
 #endif
@@ -75,6 +79,7 @@
     TEST_CONFIG_ENABLE_BETA_1_HW = 0,                           ///< Test configuration to enable Beta 1.0 hardware.
     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;