Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r36a2fa774e2f5721c30261a40360d706bb4ea4bb
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 36a2fa774e2f5721c30261a40360d706bb4ea4bb)
@@ -35,9 +35,9 @@
 
 // ********** private definitions **********
 
-#define NUM_OF_CAN_OUT_BUFFERS          5       // # of CAN buffers for transmit
-#define NUM_OF_CAN_IN_BUFFERS           7       // # of CAN buffers for receiving
-#define NUM_OF_MSG_IN_BUFFERS           8       // # of Msg buffers for receiving - 1 is UART
+#define NUM_OF_CAN_OUT_BUFFERS          4       // # of CAN buffers for transmit
+#define NUM_OF_CAN_IN_BUFFERS           6       // # of CAN buffers for receiving
+#define NUM_OF_MSG_IN_BUFFERS           7       // # of Msg buffers for receiving - 1 is UART
 
 #define SCI1_RECEIVE_DMA_REQUEST        30
 #define SCI1_TRANSMIT_DMA_REQUEST       31
@@ -813,6 +813,10 @@
 static void checkTooManyBadMsgCRCs( void )
 {
     U32 listTimeInMS;
+#ifdef CAN_TEST
+        static U32 crcErrorCtr = 0;
+        crcErrorCtr++;
+#endif
 
     // replace oldest bad CRC in list with this new one
     badCRCTimeStamps[ badCRCListIdx ] = getMSTimerCount();
@@ -825,8 +829,10 @@
     if ( ( badCRCListCount >= MAX_COMM_CRC_FAILURES ) && ( listTimeInMS <= MAX_COMM_CRC_FAILURE_WINDOW_MS ) )
     {
 #ifndef DISABLE_CRC_ERROR
+#ifndef CAN_TEST
         activateAlarmNoData( ALARM_ID_COMM_TOO_MANY_BAD_CRCS );
 #endif
+#endif
     }
 }