Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r9c785697827d1a21021b48b57d5a14f157856ec2 -r5c7add17cecb0528db91b9c805c95f9372dc341b
--- 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 5c7add17cecb0528db91b9c805c95f9372dc341b)
@@ -19,19 +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
+class DDFPTestConfigOptions(DialinEnum):
+    TEST_CONFIG_DISABLE_BC_PRES_ALARM = 0                       # Test configuration disabling BC pressure alarms
+    # TEST_CONFIG_BETA_HW =  1                                    # Test configuration using Beta Hardware
+    TEST_CONFIG_ENABLE_DRY_BICART_FILL = 1                      # Test configuration disabling Dry Bicart fill check
+    TEST_CONFIG_ENABLE_4WIRE_RINSE_PUMP = 2                     # Test configuration Enabling 4 wire rinse pump
+    TEST_CONFIG_SKIP_FILTERS_FLUSH = 3                          # Test configuration to skip filter flush
     NUM_OF_TEST_CONFIGS = 4                                     # 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)
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs