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