Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r7acb9d914f79aaa921c95e1a4049594c889bf795 -r8b56b0c617ac49536b8d53852b9621be873bade6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7acb9d914f79aaa921c95e1a4049594c889bf795)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8b56b0c617ac49536b8d53852b9621be873bade6)
@@ -353,32 +353,7 @@
     return result;
 }
 
-#ifdef CAN_TEST
-void broadcastCANTest1LargeFrequentMessage()
-{
-    static U16 seqNo = 0;
-    MESSAGE_T msg;
-    U32 i;
 
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_CAN_TEST_1_LARGE_FREQ;
-    msg.hdr.payloadLen = 96;
-
-    for ( i = 0; i < 12; i++ )
-    {
-        memcpy(&msg.payload[i*8], &seqNo, 2);
-        seqNo++;
-    }
-    memcpy(&msg.payload[94], &seqNo, 2);
-    seqNo++;
-
-    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
-}
-#endif
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -527,54 +502,18 @@
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
 
 /*************************************************************************
- * @brief handleTestLoadCellA1OverrideRequest
- * The handleTestLoadCellA1OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
+ * @brief
+ * The handleTestLoadCellOverrideRequest function handles a request to \n
+ * override the value read from the given load cell.
  * @details
  * Inputs : none
  * Outputs : message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellA1OverrideRequest, testSetLoadCellA1Override, testResetLoadCellA1Override )
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
 
 /*************************************************************************
- * @brief handleTestLoadCellA2OverrideRequest
- * The handleTestLoadCellA2OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellA2OverrideRequest, testSetLoadCellA2Override, testResetLoadCellA2Override )
-
-/*************************************************************************
- * @brief handleTestLoadCellB1OverrideRequest
- * The handleTestLoadCellB1OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellB1OverrideRequest, testSetLoadCellB1Override, testResetLoadCellB1Override )
-
-/*************************************************************************
- * @brief handleTestLoadCellB2OverrideRequest
- * The handleTestLoadCellB2OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellB2OverrideRequest, testSetLoadCellB2Override, testResetLoadCellB2Override )
-
-/*************************************************************************
  * @brief handleSetRTCTimestamp
  * The handleSetRTCTimestamp function handles a request to write time and
  * date to RTC