Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r22454fbcfdd5607b8138cd7412acfdbcdf3384b9 -rdb4edbea32c4cf60d80710bd0eb56728706ac8c8
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 22454fbcfdd5607b8138cd7412acfdbcdf3384b9)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision db4edbea32c4cf60d80710bd0eb56728706ac8c8)
@@ -244,16 +244,14 @@
     MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040
     MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041
     MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042
-    # TODO need to align DD message IDs
-    MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xA043
-    # MSG_ID_DD_SEND_TEST_CONFIGURATION = 0xA002
     MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043
     MSG_ID_DD_GET_TEST_CONFIGURATION = 0XA044
     MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0XA045
 
     MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01
     MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02
+    MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03
 
     MSG_ID_FP_TESTER_LOGIN_REQUEST = 0xB000
     MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001
@@ -300,6 +298,9 @@
     MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A
     MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B
     MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C
+    MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D
+    MSG_ID_FP_GET_TEST_CONFIGURATION = 0XB02E
+    MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0XB02F
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2
Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r22454fbcfdd5607b8138cd7412acfdbcdf3384b9 -rdb4edbea32c4cf60d80710bd0eb56728706ac8c8
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 22454fbcfdd5607b8138cd7412acfdbcdf3384b9)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision db4edbea32c4cf60d80710bd0eb56728706ac8c8)
@@ -21,14 +21,12 @@
 @unique
 class DDTestConfigOptions(DialinEnum):
     TEST_CONFIG_BETA_HW =  0                                    # Test configuration using Beta Hardware
-    TEST_CONFIG_FIRST = TEST_CONFIG_BETA_HW                     # First Test Configuration
     TEST_CONFIG_DISABLE_BC_PRES_ALARM = 1                       # Test configuration to disable inlet water temperature check
     TEST_CONFIG_DIENER_CONC_PUMP = 2                            # Test configuration recover treatment
     NUM_OF_TEST_CONFIGS = 3                                     # Number of Test Configs
 
 @unique
 class FPTestConfigOptions(DialinEnum):
     TEST_CONFIG_BETA_HW = 0                                     # Test configuration using Beta Hardware
-    TEST_CONFIG_FIRST = TEST_CONFIG_BETA_HW                     # First Test Configuration
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
 
Index: leahi_dialin/dd/modules/dd_test_configs.py
===================================================================
diff -u -re5772cd214690a61daa26c1c3c3ea9df7fd17ef5 -rdb4edbea32c4cf60d80710bd0eb56728706ac8c8
--- leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision e5772cd214690a61daa26c1c3c3ea9df7fd17ef5)
+++ leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision db4edbea32c4cf60d80710bd0eb56728706ac8c8)
@@ -58,32 +58,7 @@
         @return: the status of a test config
         """
         return self.dd_test_configs[DDTestConfigOptions(config).name]
-    # TODO
-    def cmd_set_recover_from_mode_fault_signal(self):
-        """
-        Constructs and sends the DD test config the signal to recover from mode fault
-        Constraints:
-            Must be logged into DD.
 
-        @return: 1 if successful, zero otherwise
-        """
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dd_to_dialin_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_SIGNAL_RECOVER_FROM_FAULT_MODE.value)
-
-        self.logger.debug("Setting signal to recover from mode fault")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is no content...
-        if received_message is not None:
-            # response payload is OK or not OK
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
-
     def cmd_set_test_config(self, config: int, reset: int = NO_RESET):
         """
         Constructs and sends the DD test config
Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -r22454fbcfdd5607b8138cd7412acfdbcdf3384b9 -rdb4edbea32c4cf60d80710bd0eb56728706ac8c8
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 22454fbcfdd5607b8138cd7412acfdbcdf3384b9)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision db4edbea32c4cf60d80710bd0eb56728706ac8c8)
@@ -58,32 +58,8 @@
         @return: the status of a test config
         """
         return self.fp_test_configs[FPTestConfigOptions(config).name]
-    # TODO
-    def cmd_set_recover_from_mode_fault_signal(self):
-        """
-        Constructs and sends the FP test config the signal to recover from mode fault
-        Constraints:
-            Must be logged into FP.
 
-        @return: 1 if successful, zero otherwise
-        """
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.fp_to_dialin_ch_id,
-                                              message_id=MsgIds.MSG_ID_FP_SIGNAL_RECOVER_FROM_FAULT_MODE.value)
-
-        self.logger.debug("Setting signal to recover from mode fault")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is no content...
-        if received_message is not None:
-            # response payload is OK or not OK
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
-    # TODO check if FP uses own test config messages or shares with DD
     def cmd_set_test_config(self, config: int, reset: int = NO_RESET):
         """
         Constructs and sends the FP test config