Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r6679a2cd813b21a8cb4c58b3eeb721e0eef9a10b -r9102c5da21a15bdaf4bb3bc38795ceb064e3c443
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6679a2cd813b21a8cb4c58b3eeb721e0eef9a10b)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9102c5da21a15bdaf4bb3bc38795ceb064e3c443)
@@ -131,6 +131,7 @@
     MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST,
     MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST,
     MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA,
+    MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                               //50
 };
 
 /// Message handling function table
@@ -174,7 +175,7 @@
     &testHeaterDutyCycleOverride,
     &testLevelsDataPublishIntervalOverride,
     &testLevelStatusOverride,
-    &testTDCommunicationStatus,                                                        //40
+    &testTDCommunicationStatusOverride,                                                //40
     &testDDOpModePublishIntervalOverride,
     &testSetOperationMode,
     &testDDstartGenDialysateOverride,
@@ -184,6 +185,7 @@
     &testHeaterStartStopOverride,
     &testValveOpenCloseStateOverride,
     &handleDialysateDeliveryRequestMsg,
+    &testROCommunicationStatusOverride,                                                //50
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))
@@ -382,7 +384,8 @@
     COMM_BUFFER_T respBuffer = tdResponseBuffers[ message->in_buffer ];
 
     // if Dialin message, ensure Dialin is logged in before processing it
-    if ( ( message->hdr.msgID <= MSG_ID_FIRST_DD_TESTER_MESSAGE ) ||
+    if ( ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE ) ||
+         ( MSG_ID_FIRST_DD_TESTER_MESSAGE == message->hdr.msgID ) ||
          ( TRUE == isTestingActivated() ) )
     {
         MsgFuncPtr msgFuncPtr;
@@ -396,7 +399,7 @@
         }
     }
     // ACK/NAK request
-    if ( message->hdr.msgID < MSG_ID_FIRST_DD_TESTER_MESSAGE )
+    if ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE )
     {
         if ( respBuffer != COMM_BUFFER_NOT_USED )
         {