Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r88cf855ac0d2a8612f610d35a96ac0cd5accf74c -r66ca4d7e28f9a008813bc7bca92dbd98616a840b
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 88cf855ac0d2a8612f610d35a96ac0cd5accf74c)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 66ca4d7e28f9a008813bc7bca92dbd98616a840b)
@@ -23,16 +23,17 @@
     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_4WIRE_RINSE_PUMP = 3                  # (DD) Test configuration enabling 4 wire rinse pump
+    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_D79_PWM_CONTROL = 6                   # (DD) Test configuration to switch to PWM control for D79
-    TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL = 7              # (DD) Test configuration to enable Chamber H Fill
-    TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS = 8              # (DD) Test configuration to disable DD conductivity alarms
-    TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS = 9              # (FP) Test configuration to disable FP conductivity alarms
-    TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL = 10         # (DD) Test configuration to switch to open loop control for concentrate dosing
-    TEST_CONFIG_DD_ENABLE_UF_TEMP_COMP = 11                     # (DD) Test configuration to enable Ultrafiltration temperature compensation
-    NUM_OF_TEST_CONFIGS = 12                                    # Number of Test Configs
+    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
+    NUM_OF_TEST_CONFIGS = 13                                    # Number of Test Configs
 DDFPTestConfigOptions._str_list = {}
 
 @unique
Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -r27ee509d072faa466186ebe4d1f105c76fb8c62b -r66ca4d7e28f9a008813bc7bca92dbd98616a840b
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 27ee509d072faa466186ebe4d1f105c76fb8c62b)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 66ca4d7e28f9a008813bc7bca92dbd98616a840b)
@@ -53,6 +53,7 @@
             dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name: 0.0,
+            dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0,
Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r66ca4d7e28f9a008813bc7bca92dbd98616a840b
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision 66ca4d7e28f9a008813bc7bca92dbd98616a840b)
@@ -95,13 +95,13 @@
                                                                        self._handler_fp_defeatured_response)
 
         # create properties
+        self.fp_defeatured = False
         self.fp_defeatured_timestamp = 0.0
         self.fp_op_mode_timestamp = 0.0
         self.fp_debug_events_timestamp = 0.0
         self.fp_version_response_timestamp = 0.0
         self.fp_operation_mode = fp_enum_repository.FPOpModes.MODE_INIT.value
         self.fp_operation_sub_mode = 0
-        self.fp_defeatured = None
         self.fp_logged_in = False
         self.fp_set_logged_in_status(False)
         self.fp_version = None
@@ -223,7 +223,7 @@
         self.fp_op_mode_timestamp = timestamp
 
 
-    @publish(["msg_id_fp_def_status_response", "is_fp_defeatured"])
+    @publish(["msg_id_fp_def_status_response", "fp_defeatured"])
     def _handler_fp_defeatured_response(self, message, timestamp = 0.0):
         """
         Handler for response from FP regarding its defeatured status.