Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r388a6f1cf7661a973b0b08c2eeb4de30522c1e88 -rea0ff19964e57c32977c8078be5dc4d6e4eee518
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 388a6f1cf7661a973b0b08c2eeb4de30522c1e88)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ea0ff19964e57c32977c8078be5dc4d6e4eee518)
@@ -1097,7 +1097,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
 
 /*************************************************************************
  * @brief
@@ -1109,7 +1109,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( BOOL, handleTestTemperatureSensorsOverrideRequest, \
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestTemperatureSensorsOverrideRequest, \
                                       testSetMeasuredTemperatureOverride, testResetMeasuredTemperatureOverride )
 
 /*************************************************************************
@@ -1122,7 +1122,7 @@
 * @param message : a pointer to the message to handle
 * @return none
 *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestTemperatureSensorsDataPublishOverrideRequest, \
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestTemperatureSensorsDataPublishOverrideRequest, \
                                 testSetTemperatureSensorsPublishIntervalOverride, testResetTemperatureSensorsPublishIntervalOverride )
 
 /*************************************************************************
@@ -1135,7 +1135,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestHeatersDataPublishOverrideRequest, \
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestHeatersDataPublishOverrideRequest, \
                                 testSetHeatersPublishIntervalOverride, testResetHeatersPublishIntervalOverride )
 
 /*************************************************************************
@@ -1160,7 +1160,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( BOOL, handleTestPressureSensorOverrideRequest, testSetDGPressureSensorOverride, testResetDGPressureSensorOverride )
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestPressureSensorOverrideRequest, testSetDGPressureSensorOverride, testResetDGPressureSensorOverride )
 
 /*************************************************************************
  * @brief
@@ -1220,7 +1220,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestDrainPumpSetPointOverrideRequest, testSetTargetDrainPumpSpeedOverride, testResetTargetDrainPumpSpeedOverride )
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDrainPumpSetPointOverrideRequest, testSetTargetDrainPumpSpeedOverride, testResetTargetDrainPumpSpeedOverride )
 
 /*************************************************************************
  * @brief
@@ -1256,7 +1256,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestValvesStatesPublishIntervalOverrideRequest, testSetValvesStatesPublishIntervalOverride, testResetValvesStatesPublishIntervalOverride )
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestValvesStatesPublishIntervalOverrideRequest, testSetValvesStatesPublishIntervalOverride, testResetValvesStatesPublishIntervalOverride )
 
 /*************************************************************************
  * @brief