Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b -re27f157082335696e336c9d9952392bc62e3c8c8
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision e27f157082335696e336c9d9952392bc62e3c8c8)
@@ -19,20 +19,16 @@
 
 
 @unique
-class DDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_DISABLE_BC_PRES_ALARM =  0                      # Test configuration to disable Balancing Chamber pressure alarms
-    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 1                          # Test configuration to switch to HW in development
-    TEST_CONFIG_USE_DIENER_1000_PUMP = 2                        # Test configuration to use Diener 1000 concentracte pump instead of Diener 2000
-    TEST_CONFIG_DISABLE_CHAMBER_H_FILL = 3                      # Test configuration to disable Chamber H fill in case if D46 sensor is disabled
-    TEST_CONFIG_DISABLE_CHAMBER_F_FILL = 4                      # Test configuration to disable Chamber F fill in case if D63 and D98 sensor is disabled
+class DDFPTestConfigOptions(DialinEnum):
+    TEST_CONFIG_DISABLE_BC_PRES_ALARM =  0                      # (DD) Test configuration to disable Balancing Chamber pressure alarms
+    TEST_CONFIG_ENABLE_BETA_1_9_HW = 1                          # (DD & FP) Test configuration to switch to HW in development
+    TEST_CONFIG_USE_DIENER_1000_PUMP = 2                        # (DD) Test configuration to use Diener 1000 concentracte pump instead of Diener 2000
+    TEST_CONFIG_DISABLE_CHAMBER_H_FILL = 3                      # (DD) Test configuration to disable Chamber H fill in case if D46 sensor is disabled
+    TEST_CONFIG_DISABLE_CHAMBER_F_FILL = 4                      # (DD) Test configuration to disable Chamber F fill in case if D63 and D98 sensor is disabled
     NUM_OF_TEST_CONFIGS = 5                                     # Number of Test Configs
 
-@unique
-class FPTestConfigOptions(DialinEnum):
-    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 0                          # Test configuration to switch to HW in development
-    NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
 
 @unique
 class TDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 0                          # Test configuration to switch to HW in development
+    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