Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r4430e1ca7702ad6258244e5366d1698a53d8846f
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 4430e1ca7702ad6258244e5366d1698a53d8846f)
@@ -19,22 +19,19 @@
 
 
 @unique
-class DGTestConfigOptions(DialinEnum):
-    TEST_CONFIG_MIX_WITH_WATER = 0                               # Test config mix with water.
-    TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK = 1               # Test config disable inlet water temperature check
-    TEST_CONFIG_RECOVER_TREATMENT = 2                            # Test config recover treatment
-    NUM_OF_TEST_CONFIGS = 3                                      # Number of test configuration.
+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_DIENER_CONC_PUMP = 2                            # Test configuration using Diener concentrate pump
+    NUM_OF_TEST_CONFIGS = 3                                     # 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 HDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_USE_WET_CARTRIDGE = 0                             # Test configuration use wet cartridge.
-    TEST_CONFIG_USE_WORN_CARTRIDGE = 1                            # Test configuration use worn cartridge.
-    TEST_CONFIG_EXPEDITE_PRE_TREATMENT = 2                        # Test configuration expedite pre-treatment.
-    TEST_CONFIG_SKIP_BLOOD_PRIME = 3                              # Test configuration skip blood prime.
-    TEST_CONFIG_SKIP_DISINFECT_AND_SERVICE_TX_BLOCKERS = 4        # Test configuration skip disinfect and service treatment blockers.
-    TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK = 5       # Test configuration disable wet self test displacement check.
-    TEST_CONFIG_RECOVER_TREATMENT = 6                             # Test configuration recover treatment.
-    TEST_CONFIG_ENABLE_ONE_MINUTE_TREATMENT = 7                   # Test configuration enable one minute treatment.
-    TEST_CONFIG_DISABLE_BLOOD_LEAK_ALARM = 8                      # Test configuration disable blood leak alarm.
-    NUM_OF_TEST_CONFIGS = 9                                       # Number of test configurations
+class TDTestConfigOptions(DialinEnum):
+    TEST_CONFIG_FIRST = 0                                       # First test configuration (placeholder)
+    NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
+