Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r914620537399ff9ecc4925fc56f8b8be567d184e
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 914620537399ff9ecc4925fc56f8b8be567d184e)
@@ -159,7 +159,6 @@
     P25_LEVEL = 0                               # P25 Level sensor
     NUM_OF_FP_LEVEL_SENSORS = 1                 # Number of FP Level Sensors
 
-@unique
 class FPPressureSensorNames(DialinEnum):
     M3_PRES                             = 0     # Water inlet pressure before regulator
     P8_PRES                             = 1     # Water inlet pressure after regulator
@@ -188,7 +187,6 @@
     FB_DUTY_CYCLE_PCT = 8               # Feedback Duty Cycle Percentage attribute for pumps
     NUM_OF_RO_PUMP_ATTRIBUTES = 9       # Number of pump attributes
 
-@unique
 class FPTemperaturesNames(DialinEnum):
     M3_TEMP                              = 0     # Temperature after pressure regulator (M3)
     P8_TEMP                              = 1     # Temperature before inlet conductivity sensor (P8)
Index: leahi_dialin/dd/modules/dd_test_configs.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r914620537399ff9ecc4925fc56f8b8be567d184e
--- leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision 914620537399ff9ecc4925fc56f8b8be567d184e)
@@ -42,8 +42,6 @@
         self.dd_test_configs = dict()
         self.dd_test_configs_response_timestamp = 0.0
 
-        self._reset_test_configs_record()
-
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_to_dialin_ch_id
             self.msg_id_dd_send_test_config = MsgIds.MSG_ID_DD_SEND_TEST_CONFIGURATION.value
Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r914620537399ff9ecc4925fc56f8b8be567d184e
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 914620537399ff9ecc4925fc56f8b8be567d184e)
@@ -41,8 +41,6 @@
         self.fp_test_configs = dict()
         self.fp_test_configs_response_timestamp = 0.0
 
-        self._reset_test_configs_record()
-
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_to_dialin_ch_id
             self.msg_id_fp_send_test_config = MsgIds.MSG_ID_FP_SEND_TEST_CONFIGURATION.value
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r914620537399ff9ecc4925fc56f8b8be567d184e
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 914620537399ff9ecc4925fc56f8b8be567d184e)
@@ -34,13 +34,11 @@
         self.can_interface = can_interface
         self.logger = logger
 
-
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
             self.msg_id_fp_temperature_data = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_temperature_data,
                                                                        self._handler_temperature_sensors_sync)
-
         self.fp_temperature_sensors_timestamp = 0
         self.fp_temperatures = {
             FPTemperaturesNames.M3_TEMP.name: 0.0,
@@ -130,30 +128,31 @@
 
         # FP Conductivity Sensors' Temperature Override
         if FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= FPTemperaturesNames.LAST_CONDUCTIVITY_SENSOR.value:
-            index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET)
+            modified_index = sensor_index - FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET
             msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST
 
         # FP Flow Sensors' Temperature Override
         elif FPTemperaturesNames.FIRST_FLOW_SENSOR.value <= sensor_index < FPTemperaturesNames.LAST_FLOW_SENSOR.value:
-            index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_FLOW_SENSOR.value)
+            modified_index = sensor_index - FPTemperaturesNames.FIRST_FLOW_SENSOR.value
             msg_id = MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST
 
         # FP Pressure Sensors' Temperature Override
         else:
-            index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET)
+            modified_index = sensor_index - FPTemperaturesNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET
             msg_id = MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST
         
+        index = integer_to_bytearray(modified_index)
         rst = integer_to_bytearray(reset)
         value = float_to_bytearray(sensor_value)
         payload = rst + value + index
            
-        valve_name = FPTemperaturesNames(sensor_index).name.split('_')[0]
+        sensor_name = FPTemperaturesNames(sensor_index).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
             channel_id = DenaliChannels.dialin_to_fp_ch_id,
             msg_id = msg_id,
-            entity_name = f'FP {valve_name} Temperature Sensor temperature',
+            entity_name = f'FP {sensor_name} Temperature Sensor temperature',
             override_text = str(sensor_value),
             logger = self.logger,
             can_interface = self.can_interface)
Index: leahi_dialin/td/modules/td_test_configs.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r914620537399ff9ecc4925fc56f8b8be567d184e
--- leahi_dialin/td/modules/td_test_configs.py	(.../td_test_configs.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/modules/td_test_configs.py	(.../td_test_configs.py)	(revision 914620537399ff9ecc4925fc56f8b8be567d184e)
@@ -41,8 +41,6 @@
         self.td_test_configs = dict()
         self.td_test_configs_response_timestamp = 0.0
 
-        self._reset_test_configs_record()
-
         if self.can_interface is not None:
             channel_id = DenaliChannels.td_to_dialin_ch_id
             self.msg_id_td_send_test_config = MsgIds.MSG_ID_TD_SEND_TEST_CONFIGURATION.value
Index: leahi_dialin/td/proxies/ui_proxy.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r914620537399ff9ecc4925fc56f8b8be567d184e
--- leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 914620537399ff9ecc4925fc56f8b8be567d184e)
@@ -17,7 +17,7 @@
 import struct
 from logging import Logger
 
-from leahi_dialin.td.modules.constants import ACCEPTED
+from leahi_dialin.common.constants import ACCEPTED
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions, RequestRejectReasons
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem