Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r62640bb1dfcb4279d31719ca933c3ce69bfb46be -reb312be9dab95907142103419bc1804713789e8d
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 62640bb1dfcb4279d31719ca933c3ce69bfb46be)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision eb312be9dab95907142103419bc1804713789e8d)
@@ -20,25 +20,25 @@
 
 @unique
 class DDFPTestConfigOptions(DialinEnum):
-    TEST_CONFIG_DD_FP_ENABLE_BETA_1_HW =  0                     # (DD & FP) Test configuration using Beta 1 Hardware
-    TEST_CONFIG_DD_DISABLE_BC_PRES_ALARM = 1                    # (DD) Test configuration disabling BC pressure alarms
-    TEST_CONFIG_DD_ENABLE_DRY_BICARB = 2                        # (DD) Test configuration enable Dry Bicarb usage
-    TEST_CONFIG_DD_ENABLE_D79_PWM_CONTROL = 3                   # (DD) Test configuration to switch to PWM control for D79
-    TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH = 4                       # (FP) Test configuration to skip pre-gen flush
-    TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP = 5                  # (DD) Test configuration to use Diener 1000 pump for D48
-    TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL = 6              # (DD) Test configuration to enable Chamber H Fill
-    TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS = 7              # (DD) Test configuration to disable DD conductivity alarms
-    TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS = 8              # (FP) Test configuration to disable FP conductivity alarms
-    TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL = 9          # (DD) Test configuration to switch to open loop control for concentrate dosing
-    TEST_CONFIG_DD_ENABLE_UF_TEMP_COMP = 10                     # (DD) Test configuration to enable Ultrafiltration temperature compensation
-    TEST_CONFIG_DD_RUN_SOLO = 11                                # (DD) Test configuration to run DD alone without the other subsystems
-    TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW = 12                   # (DD) Test configuration to run DD alone without the other subsystems
-    TEST_CONFIG_DD_DRY_BICART_TEST = 13                         # (DD) Test configuration to test drybicart initial fill from pre-gen
-    NUM_OF_TEST_CONFIGS = 14                                    # Number of Test Configs
+    TEST_CONFIG_DD_FP_ENABLE_BETA_1_HW              = 0         # (DD & FP) Test configuration using Beta 1.0 Hardware
+    TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW            = 1         # (DD & FP) Test configuration using Beta 2.0 Hardware
+    TEST_CONFIG_DD_DISABLE_BC_PRES_ALARM            = 2         # (DD) Test configuration disabling BC pressure alarms
+    TEST_CONFIG_DD_ENABLE_DRY_BICARB                = 3         # (DD) Test configuration enable Dry Bicarb usage
+    TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH               = 4         # (FP) Test configuration to skip pre-gen flush
+    TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP          = 5         # (DD) Test configuration to use Diener 1000 pump for D48
+    TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL      = 6         # (DD) Test configuration to enable Chamber H Fill
+    TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS      = 7         # (DD) Test configuration to disable DD conductivity alarms
+    TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS      = 8         # (FP) Test configuration to disable FP conductivity alarms
+    TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL  = 9         # (DD) Test configuration to switch to open loop control for concentrate dosing
+    TEST_CONFIG_DD_ENABLE_UF_TEMP_COMP              = 10        # (DD) Test configuration to enable Ultrafiltration temperature compensation
+    TEST_CONFIG_DD_RUN_SOLO                         = 11        # (DD) Test configuration to run DD alone without the other subsystems
+    TEST_CONFIG_DD_DRY_BICART_TEST                  = 12        # (DD) Test configuration to test drybicart initial fill from pre-gen
+    NUM_OF_TEST_CONFIGS                             = 13        # Number of Test Configs
 DDFPTestConfigOptions._str_list = {}
 
 @unique
 class TDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_ENABLE_BETA_1_HW = 0                            # Test configuration using Beta 1 Hardware
-    NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
+    TEST_CONFIG_ENABLE_BETA_1_HW                    = 0         # Test configuration using Beta 1 Hardware
+    TEST_CONFIG_SKIP_BLOOD_PRIME                    = 1         # Test configuration to skip blood priming
+    NUM_OF_TEST_CONFIGS                             = 2         # Number of Test Configs
 TDTestConfigOptions._str_list = {}