Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r059eb49a6f8fd2e2277b98b4aee986eb4519820a -r608780a6e5449b5a9710ac07299ec028117c9f4d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 059eb49a6f8fd2e2277b98b4aee986eb4519820a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 608780a6e5449b5a9710ac07299ec028117c9f4d)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      08-Aug-2022
+* @author  (last)      Dong Nguyen
+* @date    (last)      27-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -916,9 +916,11 @@
             break;
     }
 
+#ifndef _VECTORCAST_
     // handle any test messages if tester has logged in successfully
     // NOTE: END_OF_MSG_IDS = 65536 which is out of the range of a U16 so it is subtracted by 1. This is unreachable in development testing
     if ( ( msgID > MSG_ID_FIRST_DG_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS - 1 ) && ( TRUE == isTestingActivated() ) )
+#endif
     {
         switch ( msgID )
         {