Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rb05bbd09d430425d907779b02feadde8addc8c79 -r842fe6e438c788fc3e1206615202b2decc82f8a3
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision b05bbd09d430425d907779b02feadde8addc8c79)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 842fe6e438c788fc3e1206615202b2decc82f8a3)
@@ -97,7 +97,9 @@
 
 /// Message handling function lookup table
 static const MSG_HANDLER_LOOKUP_T MSG_FUNCTION_HANDLER_LOOKUP[] = {
+    { MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST,                             &handleActiveAlarmListRequest },
     { MSG_ID_FW_VERSIONS_REQUEST,                                       &handleVersionRequestMessage },
+    { MSG_ID_UI_CHECK_IN,                                               &handleUICheckIn },
     { MSG_ID_DD_OP_MODE_DATA,                                           &setDDOpMode },
     { MSG_ID_DD_PRESSURES_DATA,                                         &setDialysatePressure },
     { MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,                           &validateAndSetTreatmentParameters },
@@ -154,7 +156,12 @@
     { MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testSetOpModePublishIntervalOverride },
     { MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST,                               &testSetOperationMode },
     { MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST,                        &testSetEjectorMotorSpeed },
-    { MSG_ID_TD_EJECTOR_COMMAND,                                        &testEjectorCommand }
+    { MSG_ID_TD_EJECTOR_COMMAND,                                        &testEjectorCommand },
+    { MSG_ID_TD_SET_AIR_TRAP_CONTROL,                                   &testSetAirTrapControl },
+    { MSG_ID_TD_HOME_BLOOD_PUMP,                                        &testHomeBloodPump },
+    { MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST,          &testBPFlowAlphaYInterceptOverride },
+    { MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST,                &testBPFlowWearATermOverride },
+    { MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST,                &testBPFlowWearBTermOverride }
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
@@ -411,10 +418,11 @@
     // ACK/NAK request
     if ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE )
     {
-        if ( respBuffer != COMM_BUFFER_NOT_USED )
-        {
-            sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, respBuffer, ack );
-        }
+        // Already ACK'd msg if required prior to this function
+//        if ( respBuffer != COMM_BUFFER_NOT_USED )
+//        {
+//            sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, respBuffer, ack );
+//        }
     }
     else
     {
@@ -595,6 +603,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleUICheckIn function handles a Ui check in message.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @param message Pointer to the UI check-in message
+ * @return TRUE if check-in successful, FALSE if not
+ *************************************************************************/
+BOOL handleUICheckIn( MESSAGE_T *message )
+{
+    return TRUE; // no specific handling required.
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTesterLogInRequest function handles a Dialin request to login.
  * @details \b Inputs: none
  * @details \b Outputs: Dialin logged in if request is authenticated.