Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r8e7d30d231de616b58a765d98495ba34010781c8 -r2205857f59dd884c4af450239381387cfb560c2e
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 8e7d30d231de616b58a765d98495ba34010781c8)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
@@ -7,6 +7,7 @@
 #include "PAL.h"
 #include "SystemCommRO.h"
 #include "Utilities.h"
+#include "Valves.h"
 
 
 /**
@@ -48,12 +49,22 @@
 
 /// Message handling function lookup table
 static const U16 MSG_FUNCTION_HANDLER_LOOKUP[] = {
-    MSG_ID_TESTER_LOGIN_REQUEST,
+    MSG_ID_RO_TESTER_LOGIN_REQUEST,
+    MSG_ID_RO_SOFTWARE_RESET_REQUEST,
+    MSG_ID_RO_SEND_TEST_CONFIGURATION,
+    MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST,
+    MSG_ID_RO_VALVE_SENSED_STATE_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
 static const MsgFuncPtr MSG_FUNCTION_HANDLERS[] = {
-    &handleTesterLogInRequest
+    &handleTesterLogInRequest,
+    &handleROSoftwareResetRequest,
+    &handleROTestConfiguration,
+    &testValvesStatesPublishIntervalOverride,
+    &testValveStateOverride,
+    &testValveSensedStateOverride,
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))
@@ -569,4 +580,22 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleROTestConfiguration function handles a request to set an RO test
+ * configuration flag.
+ * @details \b Inputs: none
+ * @details \b Outputs: message handled
+ * @param message a pointer to the set test configuration message to handle
+ * @return TRUE if test configuration flag set successfully, FALSE if not.
+ *************************************************************************/
+BOOL handleROTestConfiguration( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // TODO - implement.
+
+    return result;
+}
+
 /**@}*/