Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r99f108ac337a30a2407410ca8be9a990cee9758a
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 99f108ac337a30a2407410ca8be9a990cee9758a)
@@ -31,13 +31,13 @@
 const ALARM_DATA_T blankAlarmData = { ALARM_DATA_TYPE_NONE, 0 };        ///< A blank alarm data record for alarms that do not include alarm data when triggered.
 
 // ********** private data **********
+
+static OVERRIDE_U32_T alarmIsActive[ NUM_OF_ALARM_IDS ];                ///< Array of current state of each alarm
 
-DATA_ARRAY_DECL( BOOL, AlarmStates, NUM_OF_ALARM_IDS, alarmIsActive );  ///< Array of current state of each alarm
-
 // ********** private function prototypes **********
 
 static void activateAlarm( ALARM_ID_T alarm );
-static DATA_ARRAY_GET_PROTOTYPE( BOOL, getAlarmActive, alarmID );
+static BOOL getAlarmActive( U32 alarmID );
 
 /*********************************************************************//**
  * @brief
@@ -266,9 +266,27 @@
  * @param alarmID ID of alarm to check
  * @return TRUE if given alarm is active, FALSE if not
  *************************************************************************/
-static DATA_ARRAY_GET( BOOL, getAlarmActive, alarmID, NUM_OF_ALARM_IDS-1, alarmIsActive, TRUE )
+static BOOL getAlarmActive( U32 alarmID )
+{
+    BOOL result = TRUE;
+    if ( alarmID < NUM_OF_ALARM_IDS )
+    {
+        if ( OVERRIDE_KEY == alarmIsActive[ alarmID ].override )
+        {
+            result = (BOOL)alarmIsActive[ alarmID ].ovData;
+        }
+        else
+        {
+            result = (BOOL)alarmIsActive[ alarmID ].data;
+        }
+    }
+    else
+    {
+        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+    }
+    return result;
+}
 
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -292,7 +310,7 @@
     {
         if ( TRUE == isTestingActivated() )
         {
-            if ( TRUE == state )
+            if ( TRUE == (BOOL)state )
             {
                 activateAlarmNoData( (ALARM_ID_T)alarmID );
             }
Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r99f108ac337a30a2407410ca8be9a990cee9758a
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 99f108ac337a30a2407410ca8be9a990cee9758a)
@@ -51,9 +51,9 @@
 BOOL startTrimmerHeaterCmd( void );                    // handle start trimmer heater control command from HD
 BOOL stopTrimmerHeaterCmd( void );                     // handle stop trimmer heater control command from HD
 
-DATA_GET_PROTOTYPE( RESERVOIR_ID_T, getActiveReservoir );
-DATA_GET_PROTOTYPE( U32, getReservoirFillVolumeTargetMl );
-DATA_GET_PROTOTYPE( U32, getReservoirDrainVolumeTargetMl );
+RESERVOIR_ID_T getActiveReservoir( void );
+U32 getReservoirFillVolumeTargetMl( void );
+U32 getReservoirDrainVolumeTargetMl( void );
 
 BOOL testSetDGActiveReservoirOverride( RESERVOIR_ID_T value );
 BOOL testResetDGActiveReservoirOverride( void );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r99f108ac337a30a2407410ca8be9a990cee9758a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 99f108ac337a30a2407410ca8be9a990cee9758a)
@@ -83,7 +83,7 @@
  *************************************************************************/
 static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
 {
-    BOOL result = 0;
+    BOOL result = FALSE;
     BOOL error = FALSE;
     U32 msgSize = 0;
     U32 sizeMod, sizePad;
@@ -1137,8 +1137,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestWatchdogCheckInStateOverrideRequest, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride )
+void handleTestWatchdogCheckInStateOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetWatchdogTaskCheckInOverride( payload.index, (BOOL)(payload.state.u32) );
+        }
+        else
+        {
+            result = testResetWatchdogTaskCheckInOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestAlarmStateOverrideRequest function handles a request to
@@ -1149,8 +1170,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
+void handleTestAlarmStateOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetAlarmStateOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetAlarmStateOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestLoadCellOverrideRequest function handles a request to
@@ -1161,8 +1203,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
+void handleTestLoadCellOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetLoadCellOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetLoadCellOverride( payload.index );
+        }
+    }
+
+    //respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestTemperatureSensorsOverrideRequest function handles a
@@ -1173,9 +1236,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestTemperatureSensorsOverrideRequest, \
-                                      testSetMeasuredTemperatureOverride, testResetMeasuredTemperatureOverride )
+void handleTestTemperatureSensorsOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetMeasuredTemperatureOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetMeasuredTemperatureOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
 * @brief
 * The handleTestTemperatureSensorsDataPublishOverrideRequest function handles
@@ -1186,8 +1269,28 @@
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestTemperatureSensorsDataPublishOverrideRequest, \
-                                testSetTemperatureSensorsPublishIntervalOverride, testResetTemperatureSensorsPublishIntervalOverride )
+void handleTestTemperatureSensorsDataPublishOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetTemperatureSensorsPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetTemperatureSensorsPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
 
 /*********************************************************************//**
  * @brief
@@ -1199,9 +1302,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestHeatersDataPublishOverrideRequest, \
-                                testSetHeatersPublishIntervalOverride, testResetHeatersPublishIntervalOverride )
+void handleTestHeatersDataPublishOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetHeatersPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetHeatersPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestLoadCellDataBroadcastIntervalOverrideRequest function handles
@@ -1212,8 +1335,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestLoadCellDataBroadcastIntervalOverrideRequest, testSetLoadCellDataPublishIntervalOverride, testResetLoadCellDataPublishIntervalOverride )
+void handleTestLoadCellDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetLoadCellDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetLoadCellDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestPressureSensorOverrideRequest function handles a request to
@@ -1224,8 +1368,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestPressureSensorOverrideRequest, testSetDGPressureSensorOverride, testResetDGPressureSensorOverride )
+void handleTestPressureSensorOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetDGPressureSensorOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetDGPressureSensorOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestPressureDataBroadcastIntervalOverrideRequest function handles
@@ -1236,8 +1401,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestPressureDataBroadcastIntervalOverrideRequest, testSetPressuresDataPublishIntervalOverride, testResetPressuresDataPublishIntervalOverride )
+void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetPressuresDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetPressuresDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestROPumpSetPointOverrideRequest function handles a request to
@@ -1248,8 +1434,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpPressureOverride, testResetTargetROPumpPressureOverride )
+void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetTargetROPumpPressureOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetTargetROPumpPressureOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestROMeasuredFlowOverrideRequest function handles a request to
@@ -1260,8 +1467,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestROMeasuredFlowOverrideRequest, testSetMeasuredROFlowRateOverride, testResetMeasuredROFlowRateOverride )
+void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetMeasuredROFlowRateOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetMeasuredROFlowRateOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestROPumpDataBroadcastIntervalOverrideRequest function handles
@@ -1272,8 +1500,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpDataBroadcastIntervalOverrideRequest, testSetROPumpDataPublishIntervalOverride, testResetROPumpDataPublishIntervalOverride )
+void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetROPumpDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetROPumpDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDrainPumpSetPointOverrideRequest function handles a request to
@@ -1284,8 +1533,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDrainPumpSetPointOverrideRequest, testSetTargetDrainPumpSpeedOverride, testResetTargetDrainPumpSpeedOverride )
+void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetTargetDrainPumpSpeedOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetTargetDrainPumpSpeedOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDrainPumpDataBroadcastIntervalOverrideRequest function handles
@@ -1296,8 +1566,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDrainPumpDataBroadcastIntervalOverrideRequest, testSetDrainPumpDataPublishIntervalOverride, testResetDrainPumpDataPublishIntervalOverride )
+void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetDrainPumpDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetDrainPumpDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestValveStateOverrideRequest function handles a request to
@@ -1308,8 +1599,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestValveStateOverrideRequest, testSetValveStateOverride, testResetValveStateOverride )
+void handleTestValveStateOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValveStateOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetValveStateOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestValvesStatesPublishIntervalOverrideRequest function handles
@@ -1320,8 +1632,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestValvesStatesPublishIntervalOverrideRequest, testSetValvesStatesPublishIntervalOverride, testResetValvesStatesPublishIntervalOverride )
+void handleTestValvesStatesPublishIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValvesStatesPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetValvesStatesPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDGSafetyShutdownOverrideRequest function handles a
@@ -1332,8 +1665,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDGSafetyShutdownOverrideRequest, testSetSafetyShutdownOverride, testResetSafetyShutdownOverride )
+void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetSafetyShutdownOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetSafetyShutdownOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDGAccelOverrideRequest function handles a request to
@@ -1344,8 +1698,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestDGAccelOverrideRequest, testSetAccelAxisOverride, testResetAccelAxisOverride )
+void handleTestDGAccelOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetAccelAxisOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetAccelAxisOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDGAccelMaxOverrideRequest function handles a request to
@@ -1356,8 +1731,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestDGAccelMaxOverrideRequest, testSetAccelMaxOverride, testResetAccelMaxOverride )
+void handleTestDGAccelMaxOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetAccelMaxOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetAccelMaxOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDGAccelBroadcastIntervalOverrideRequest function handles a
@@ -1368,8 +1764,29 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDGAccelBroadcastIntervalOverrideRequest, testSetAccelDataPublishIntervalOverride, testResetAccelDataPublishIntervalOverride )
+void handleTestDGAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetAccelDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetAccelDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleSetAccelCalibration function handles a request to set
@@ -1406,8 +1823,29 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestSetConductivityOverrideRequest, testSetConductivityOverride, testResetConductivityOverride )
+void handleTestSetConductivityOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetConductivityOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetConductivityOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
 * @brief
 * The handleTestSetConductivityDataPublishIntervalOverrideRequest function
@@ -1418,7 +1856,27 @@
 * @param message : a pointer to the message to handle
 * @return none
 *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestSetConductivityDataPublishIntervalOverrideRequest, \
-                                testSetConductivityDataPublishIntervalOverride, testResetConductivityDataPublishIntervalOverride )
+void handleTestSetConductivityDataPublishIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetConductivityDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetConductivityDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r482f4465ccdb813922de506bf780e29f4fb2f84b -r99f108ac337a30a2407410ca8be9a990cee9758a
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 99f108ac337a30a2407410ca8be9a990cee9758a)
@@ -43,9 +43,9 @@
 
 // ********** private data **********
 
-static U32  lastWatchdogPetTime = 0;                                            ///< Previous watchdog pet time.
+static U32  lastWatchdogPetTime = 0;                                            ///< Previous watchdog pet timestamp (in ms).
 
-DATA_ARRAY_DECL( BOOL, TaskCheckIns, NUM_OF_TASKS, watchdogTaskCheckedIn );     ///< Watchdog task check-in array.
+static OVERRIDE_U32_T watchdogTaskCheckedIn[ NUM_OF_TASKS ];                    ///< Array of flags indicating whether individual tasks have checked in with watchdog manager.
 
 static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState;                        ///< Watchdog self test current state.
 static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                       ///< Watchdog self test status.
@@ -56,7 +56,7 @@
 static void resetWDTaskCheckIns( void );
 static BOOL haveAllTasksCheckedIn( void );
 static void petWatchdog( void );
-static DATA_ARRAY_GET_PROTOTYPE( BOOL, hasTaskGeneralCheckedIn, task );
+static BOOL hasTaskGeneralCheckedIn( U32 task );
 
 /*********************************************************************//**
  * @brief
@@ -88,7 +88,7 @@
  * @brief
  * The execWatchdogMgmt function executes the watchdog management service.
  * @details
- * Inputs : none
+ * Inputs : watchdogTaskCheckedIn[]
  * Outputs : Pets watchdog when all tasks checked in
  * @return none
  *************************************************************************/
@@ -256,8 +256,29 @@
  * @param task ID of task to check
  * @return TRUE if given task has checked in, FALSE if not
  *************************************************************************/
-static DATA_ARRAY_GET( BOOL, hasTaskGeneralCheckedIn, task, NUM_OF_TASKS-1, watchdogTaskCheckedIn, FALSE )
+static BOOL hasTaskGeneralCheckedIn( U32 task )
+{
+    BOOL result = FALSE;
 
+    if ( task < NUM_OF_TASKS )
+    {
+        if ( OVERRIDE_KEY == watchdogTaskCheckedIn[ task ].override )
+        {
+            result = (BOOL)watchdogTaskCheckedIn[ task ].ovData;
+        }
+        else
+        {
+            result = (BOOL)watchdogTaskCheckedIn[ task ].data;
+        }
+    }
+    else
+    {
+        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The petWatchdog function pets the watchdog by pulsing the CPLD WD pet signal.
@@ -284,15 +305,55 @@
  * @brief
  * The testSetWatchdogTaskCheckInOverride function overrides the state of the
  * task check-in with the watchdog management with a given check-in state.
- * The testResetWatchdogTaskCheckInOverride function resets the override of the
- * state of the check-in with the watchdog management.
  * @details
  * Inputs : none
  * Outputs : watchdogTaskCheckedIn[]
  * @param task ID of task to override check-in state for
  * @param value override state for the given task ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_FUNC( BOOL, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride, watchdogTaskCheckedIn, task, NUM_OF_TASKS-1 )
+BOOL testSetWatchdogTaskCheckInOverride( U32 task, BOOL value )
+{
+    BOOL result = FALSE;
 
+    if ( task < NUM_OF_TASKS )
+    {
+        if ( TRUE == isTestingActivated() )
+        {
+            result = TRUE;
+            watchdogTaskCheckedIn[ task ].ovData = value;
+            watchdogTaskCheckedIn[ task ].override = OVERRIDE_KEY;
+        }
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetWatchdogTaskCheckInOverride function resets the override of the
+ * state of the check-in with the watchdog management.
+ * @details
+ * Inputs : none
+ * Outputs : watchdogTaskCheckedIn[]
+ * @param task ID of task to override check-in state for
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetWatchdogTaskCheckInOverride( U32 task )
+{
+    BOOL result = FALSE;
+
+    if ( task < NUM_OF_TASKS )
+    {
+        if ( TRUE == isTestingActivated() )
+        {
+            result = TRUE;
+            watchdogTaskCheckedIn[ task ].override = OVERRIDE_RESET;
+            watchdogTaskCheckedIn[ task ].ovData = watchdogTaskCheckedIn[ task ].ovInitData;
+        }
+    }
+
+    return result;
+}
+
 /**@}*/