Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r9c785697827d1a21021b48b57d5a14f157856ec2 -rbc8e675ee824cde3e3e967f37ba48acaead97db2
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 9c785697827d1a21021b48b57d5a14f157856ec2)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision bc8e675ee824cde3e3e967f37ba48acaead97db2)
@@ -7,8 +7,8 @@
 #
 # @file    test_config_defs.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      16-Aug-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      21-Jan-2026
 # @author  (original)  Dara Navaei
 # @date    (original)  24-Apr-2023
 #
@@ -19,20 +19,15 @@
 
 
 @unique
-class DDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_BETA_HW =  0                                    # Test configuration using Beta Hardware
-    TEST_CONFIG_DISABLE_BC_PRES_ALARM = 1                       # Test configuration disabling BC pressure alarms
-    TEST_CONFIG_DISABLE_DIENER_CONC_PUMP = 2                    # Test configuration disabling Diener concentrate pump
-    TEST_CONFIG_ENABLE_4WIRE_RINSE_PUMP = 3                     # Test configuration Enabling 4 wire rinse pump
-    NUM_OF_TEST_CONFIGS = 4                                     # Number of Test Configs
+class DDFPTestConfigOptions(DialinEnum):
+    TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW =  0                   # (DD & FP) Test configuration using Beta Hardware
+    TEST_CONFIG_DD_DISABLE_BC_PRES_ALARM = 1                    # (DD) Test configuration disabling BC pressure alarms
+    TEST_CONFIG_DD_ENABLE_DRY_BICART_FILL = 2                   # (DD) Test configuration disabling Dry Bicart fill check
+    TEST_CONFIG_DD_ENABLE_4WIRE_RINSE_PUMP = 3                  # (DD) Test configuration Enabling 4 wire rinse pump
+    TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH = 4                       # (FP) Test configuration to skip pre-gen flush
+    NUM_OF_TEST_CONFIGS = 5                                     # Number of Test Configs
 
 @unique
-class FPTestConfigOptions(DialinEnum):
-    TEST_CONFIG_BETA_HW = 0                                     # Test configuration using Beta Hardware
-    NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
-
-@unique
 class TDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_FIRST = 0                                       # First test configuration (placeholder)
+    TEST_CONFIG_ENABLE_BETA_1_9_HW = 0                          # Test configuration to switch to HW in development
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
-