diff --git a/unit-test/lc_action_tests.c b/unit-test/lc_action_tests.c
index 8c49fba..0e9c1e4 100644
--- a/unit-test/lc_action_tests.c
+++ b/unit-test/lc_action_tests.c
@@ -1685,12 +1685,13 @@ void LC_ValidateRPN_Test_StackDepthZero2(void)
 
 void LC_ValidateRPN_Test_MaxRPNSize(void)
 {
+    int   i;
     uint8 Result;
 
     int32 IndexValue      = 0;
     int32 StackDepthValue = 0;
 
-    for (int i = 0; i < LC_MAX_RPN_EQU_SIZE; i++)
+    for (i = 0; i < LC_MAX_RPN_EQU_SIZE; i++)
     {
         LC_OperData.ADTPtr[0].RPNEquation[i] = LC_MAX_WATCHPOINTS - 1;
     }
diff --git a/unit-test/lc_app_tests.c b/unit-test/lc_app_tests.c
index b638c1e..781235a 100644
--- a/unit-test/lc_app_tests.c
+++ b/unit-test/lc_app_tests.c
@@ -1343,12 +1343,11 @@ void LC_CreateTaskCDS_Test_Nominal(void)
 void LC_CreateTaskCDS_Test_WRTRegisterCDSError(void)
 {
     int32 Result;
-
-    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 1, -1);
-
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
+    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 1, -1);
+
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error registering WRT CDS Area, RC=0x%%08X");
 
     Result = LC_CreateTaskCDS();
@@ -1367,12 +1366,11 @@ void LC_CreateTaskCDS_Test_WRTRegisterCDSError(void)
 void LC_CreateTaskCDS_Test_ARTRegisterCDSError(void)
 {
     int32 Result;
-
-    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 2, -1);
-
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
+    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 2, -1);
+
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error registering ART CDS Area, RC=0x%%08X");
 
     Result = LC_CreateTaskCDS();
@@ -1391,12 +1389,11 @@ void LC_CreateTaskCDS_Test_ARTRegisterCDSError(void)
 void LC_CreateTaskCDS_Test_AppDataRegisterCDSError(void)
 {
     int32 Result;
-
-    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 3, -1);
-
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
+    UT_SetDeferredRetcode(UT_KEY(CFE_ES_RegisterCDS), 3, -1);
+
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Error registering application data CDS Area, RC=0x%%08X");
 
diff --git a/unit-test/lc_cmds_tests.c b/unit-test/lc_cmds_tests.c
index c016b84..a507504 100644
--- a/unit-test/lc_cmds_tests.c
+++ b/unit-test/lc_cmds_tests.c
@@ -67,6 +67,7 @@ void LC_AppPipe_Test_HousekeepingRequest(void)
 {
     int32          Result;
     CFE_SB_MsgId_t TestMsgId;
+    uint8          call_count_LC_PerformMaintenance;
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_SEND_HK_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
@@ -85,7 +86,7 @@ void LC_AppPipe_Test_HousekeepingRequest(void)
     call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));
     UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 0);
 
-    uint8 call_count_LC_PerformMaintenance = UT_GetStubCount(UT_KEY(LC_PerformMaintenance));
+    call_count_LC_PerformMaintenance = UT_GetStubCount(UT_KEY(LC_PerformMaintenance));
     UtAssert_INT32_EQ(call_count_LC_PerformMaintenance, 1);
     /* Generates 1 event message we don't care about in this test */
 }
@@ -288,13 +289,13 @@ void LC_AppPipe_Test_InvalidCommandCode(void)
     int32             Result;
     CFE_SB_MsgId_t    TestMsgId;
     CFE_MSG_FcnCode_t FcnCode;
+    int32             strCmpResult;
+    char              ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     FcnCode   = 99;
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false);
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Invalid command code: ID = 0x%%08lX, CC = %%d");
 
@@ -320,6 +321,7 @@ void LC_AppPipe_Test_MonitorPacket(void)
 {
     int32          Result;
     CFE_SB_MsgId_t TestMsgId;
+    uint8          call_count_LC_CheckMsgForWPs;
 
     TestMsgId = LC_UT_MID_1;
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
@@ -333,7 +335,7 @@ void LC_AppPipe_Test_MonitorPacket(void)
     call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));
     UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 0);
 
-    uint8 call_count_LC_CheckMsgForWPs = UT_GetStubCount(UT_KEY(LC_CheckMsgForWPs));
+    call_count_LC_CheckMsgForWPs = UT_GetStubCount(UT_KEY(LC_CheckMsgForWPs));
     UtAssert_INT32_EQ(call_count_LC_CheckMsgForWPs, 1);
 }
 
@@ -436,6 +438,8 @@ void LC_SampleAPReq_Test_ArrayIndexOutOfRange(void)
 {
     CFE_SB_MsgId_t         TestMsgId;
     LC_SampleAP_Payload_t *PayloadPtr = &UT_CmdBuf.SampleAPCmd.Payload;
+    int32                  strCmpResult;
+    char                   ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_SAMPLE_AP_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
@@ -446,9 +450,6 @@ void LC_SampleAPReq_Test_ArrayIndexOutOfRange(void)
     PayloadPtr->StartIndex    = 2;
     PayloadPtr->EndIndex      = 1;
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Sample AP error: invalid AP number, start = %%d, end = %%d");
 
@@ -470,15 +471,14 @@ void LC_SampleAPReq_Test_BadSampleAllArgs(void)
 {
     CFE_SB_MsgId_t         TestMsgId;
     LC_SampleAP_Payload_t *PayloadPtr = &UT_CmdBuf.SampleAPCmd.Payload;
+    int32                  strCmpResult;
+    char                   ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_SAMPLE_AP_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Sample AP error: invalid AP number, start = %%d, end = %%d");
 
@@ -505,15 +505,14 @@ void LC_SampleAPReq_Test_ArrayEndIndexTooHigh(void)
 {
     CFE_SB_MsgId_t         TestMsgId;
     LC_SampleAP_Payload_t *PayloadPtr = &UT_CmdBuf.SampleAPCmd.Payload;
+    int32                  strCmpResult;
+    char                   ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_SAMPLE_AP_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Sample AP error: invalid AP number, start = %%d, end = %%d");
 
@@ -1222,14 +1221,13 @@ void LC_SetLCStateCmd_Test_Active(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetLCState_Payload_t *PayloadPtr = &UT_CmdBuf.SetLCStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set LC state command: new state = %%d");
 
     PayloadPtr->NewLCState = LC_STATE_ACTIVE;
@@ -1255,14 +1253,13 @@ void LC_SetLCStateCmd_Test_Passive(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetLCState_Payload_t *PayloadPtr = &UT_CmdBuf.SetLCStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set LC state command: new state = %%d");
 
     PayloadPtr->NewLCState = LC_STATE_PASSIVE;
@@ -1288,14 +1285,13 @@ void LC_SetLCStateCmd_Test_Disabled(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetLCState_Payload_t *PayloadPtr = &UT_CmdBuf.SetLCStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set LC state command: new state = %%d");
 
     PayloadPtr->NewLCState = LC_STATE_DISABLED;
@@ -1321,14 +1317,13 @@ void LC_SetLCStateCmd_Test_Default(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetLCState_Payload_t *PayloadPtr = &UT_CmdBuf.SetLCStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set LC state error: invalid state = %%d");
 
     PayloadPtr->NewLCState = 99;
@@ -1362,14 +1357,13 @@ void LC_SetAPStateCmd_Test_Default(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state error: AP = %%d, Invalid new state = %%d");
 
@@ -1397,14 +1391,13 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActive(void)
     uint16                   TableIndex;
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1451,14 +1444,13 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActiveOneNotUsed(void)
     uint16                   TableIndex;
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1506,14 +1498,13 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActiveOnePermOff(void)
     uint16                   TableIndex;
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1561,14 +1552,13 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsPassive(void)
     uint16                   TableIndex;
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1615,14 +1605,13 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsDisabled(void)
     uint16                   TableIndex;
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1668,14 +1657,13 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointActive(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1705,14 +1693,13 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointNotUsed(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state error: AP = %%d, Invalid current AP state = %%d");
 
@@ -1742,14 +1729,13 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointPassive(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1779,14 +1765,13 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointDisabled(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state command: AP = %%d, New state = %%d");
 
@@ -1816,14 +1801,13 @@ void LC_SetAPStateCmd_Test_InvalidCurrentAPStateActive(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state error: AP = %%d, Invalid current AP state = %%d");
 
@@ -1852,14 +1836,13 @@ void LC_SetAPStateCmd_Test_InvalidCurrentAPStatePassive(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state error: AP = %%d, Invalid current AP state = %%d");
 
@@ -1888,14 +1871,13 @@ void LC_SetAPStateCmd_Test_InvalidCurrentAPStateDisabled(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP state error: AP = %%d, Invalid current AP state = %%d");
 
@@ -1925,14 +1907,13 @@ void LC_SetAPStateCmd_Test_InvalidAPNumberActive(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: Invalid AP number = %%d");
 
     PayloadPtr->NewAPState = LC_APSTATE_ACTIVE;
@@ -1960,14 +1941,13 @@ void LC_SetAPStateCmd_Test_InvalidAPNumberPassive(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: Invalid AP number = %%d");
 
     PayloadPtr->NewAPState = LC_APSTATE_PASSIVE;
@@ -1994,14 +1974,13 @@ void LC_SetAPStateCmd_Test_InvalidAPNumberDisabled(void)
 {
     CFE_SB_MsgId_t           TestMsgId;
     LC_SetAPState_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPStateCmd.Payload;
+    int32                    strCmpResult;
+    char                     ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: Invalid AP number = %%d");
 
     PayloadPtr->NewAPState = LC_APSTATE_DISABLED;
@@ -2036,14 +2015,13 @@ void LC_SetAPPermOffCmd_Test_InvalidAPNumberMaxActionpoints(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_SetAPPermOff_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPPermOffCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP perm off error: Invalid AP number = %%d");
 
     PayloadPtr->APNumber = LC_MAX_ACTIONPOINTS;
@@ -2067,14 +2045,13 @@ void LC_SetAPPermOffCmd_Test_InvalidAPNumberAllActionpoints(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_SetAPPermOff_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPPermOffCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP perm off error: Invalid AP number = %%d");
 
     PayloadPtr->APNumber = LC_ALL_ACTIONPOINTS;
@@ -2098,14 +2075,13 @@ void LC_SetAPPermOffCmd_Test_APNotDisabled(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_SetAPPermOff_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPPermOffCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "Set AP perm off error, AP NOT Disabled: AP = %%d, Current state = %%d");
 
@@ -2132,14 +2108,13 @@ void LC_SetAPPermOffCmd_Test_Nominal(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_SetAPPermOff_Payload_t *PayloadPtr = &UT_CmdBuf.SetAPPermOffCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP permanently off command: AP = %%d");
 
     PayloadPtr->APNumber = 1;
@@ -2176,14 +2151,13 @@ void LC_ResetAPStatsCmd_Test_AllActionPoints(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_ResetAPStats_Payload_t *PayloadPtr = &UT_CmdBuf.ResetAPStatsCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset AP stats command: AP = %%d");
 
     PayloadPtr->APNumber = LC_ALL_ACTIONPOINTS;
@@ -2207,14 +2181,13 @@ void LC_ResetAPStatsCmd_Test_SingleActionPoint(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_ResetAPStats_Payload_t *PayloadPtr = &UT_CmdBuf.ResetAPStatsCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset AP stats command: AP = %%d");
 
     PayloadPtr->APNumber = LC_MAX_ACTIONPOINTS - 1;
@@ -2238,14 +2211,13 @@ void LC_ResetAPStatsCmd_Test_InvalidAPNumber(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_ResetAPStats_Payload_t *PayloadPtr = &UT_CmdBuf.ResetAPStatsCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset AP stats error: invalid AP number = %%d");
 
     PayloadPtr->APNumber = LC_MAX_ACTIONPOINTS;
@@ -2379,14 +2351,13 @@ void LC_ResetWPStatsCmd_Test_AllWatchPoints(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_ResetWPStats_Payload_t *PayloadPtr = &UT_CmdBuf.ResetWPStatsCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset WP stats command: WP = %%d");
 
     PayloadPtr->WPNumber = LC_ALL_WATCHPOINTS;
@@ -2410,14 +2381,13 @@ void LC_ResetWPStatsCmd_Test_SingleWatchPoint(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_ResetWPStats_Payload_t *PayloadPtr = &UT_CmdBuf.ResetWPStatsCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset WP stats command: WP = %%d");
 
     PayloadPtr->WPNumber = LC_MAX_WATCHPOINTS - 1;
@@ -2440,14 +2410,13 @@ void LC_ResetWPStatsCmd_Test_InvalidWPNumber(void)
 {
     CFE_SB_MsgId_t             TestMsgId;
     LC_ResetWPStats_Payload_t *PayloadPtr = &UT_CmdBuf.ResetWPStatsCmd.Payload;
+    int32                      strCmpResult;
+    char                       ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     TestMsgId = CFE_SB_ValueToMsgId(LC_CMD_MID);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset WP stats error: invalid WP number = %%d");
 
     PayloadPtr->WPNumber = LC_MAX_WATCHPOINTS;
diff --git a/unit-test/lc_utils_tests.c b/unit-test/lc_utils_tests.c
index 2175cb8..2236963 100644
--- a/unit-test/lc_utils_tests.c
+++ b/unit-test/lc_utils_tests.c
@@ -172,6 +172,8 @@ void LC_VerifyMsgLength_Test_Nominal(void)
 void LC_ManageTables_Test_Nominal(void)
 {
     int32 Result;
+    uint8 call_count_LC_ResetResultsWP;
+    uint8 call_count_LC_ResetResultsAP;
 
     UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_SUCCESS);
 
@@ -184,8 +186,8 @@ void LC_ManageTables_Test_Nominal(void)
     call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));
     UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 0);
 
-    uint8 call_count_LC_ResetResultsWP = UT_GetStubCount(UT_KEY(LC_ResetResultsWP));
-    uint8 call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
+    call_count_LC_ResetResultsWP = UT_GetStubCount(UT_KEY(LC_ResetResultsWP));
+    call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
 
     UtAssert_INT32_EQ(call_count_LC_ResetResultsWP, 0);
     UtAssert_INT32_EQ(call_count_LC_ResetResultsAP, 0);
@@ -194,6 +196,8 @@ void LC_ManageTables_Test_Nominal(void)
 void LC_ManageTables_Test_InfoUpdated(void)
 {
     int32 Result;
+    uint8 call_count_LC_ResetResultsWP;
+    uint8 call_count_LC_ResetResultsAP;
 
     /* Set to satisfy all instances of condition "Result == CFE_TBL_INFO_UPDATED" */
     UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_INFO_UPDATED);
@@ -207,8 +211,8 @@ void LC_ManageTables_Test_InfoUpdated(void)
     call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));
     UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 0);
 
-    uint8 call_count_LC_ResetResultsWP = UT_GetStubCount(UT_KEY(LC_ResetResultsWP));
-    uint8 call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
+    call_count_LC_ResetResultsWP = UT_GetStubCount(UT_KEY(LC_ResetResultsWP));
+    call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
 
     UtAssert_INT32_EQ(call_count_LC_ResetResultsWP, 1);
     UtAssert_INT32_EQ(call_count_LC_ResetResultsAP, 1);
@@ -219,6 +223,8 @@ void LC_ManageTables_Test_WDTGetAddressError(void)
     int32 Result;
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
+    uint8 call_count_LC_ResetResultsWP;
+    uint8 call_count_LC_ResetResultsAP;
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting WDT address, RC=0x%%08X");
 
@@ -239,8 +245,8 @@ void LC_ManageTables_Test_WDTGetAddressError(void)
     strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH);
     UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec);
 
-    uint8 call_count_LC_ResetResultsWP = UT_GetStubCount(UT_KEY(LC_ResetResultsWP));
-    uint8 call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
+    call_count_LC_ResetResultsWP = UT_GetStubCount(UT_KEY(LC_ResetResultsWP));
+    call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
 
     UtAssert_INT32_EQ(call_count_LC_ResetResultsWP, 0);
     UtAssert_INT32_EQ(call_count_LC_ResetResultsAP, 0);
@@ -251,6 +257,7 @@ void LC_ManageTables_Test_ADTGetAddressError(void)
     int32 Result;
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
+    uint8 call_count_LC_ResetResultsAP;
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting ADT address, RC=0x%%08X");
 
@@ -271,7 +278,7 @@ void LC_ManageTables_Test_ADTGetAddressError(void)
     strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH);
     UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec);
 
-    uint8 call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
+    call_count_LC_ResetResultsAP = UT_GetStubCount(UT_KEY(LC_ResetResultsAP));
 
     UtAssert_INT32_EQ(call_count_LC_ResetResultsAP, 0);
 }
diff --git a/unit-test/lc_watch_tests.c b/unit-test/lc_watch_tests.c
index d67eeba..5214c39 100644
--- a/unit-test/lc_watch_tests.c
+++ b/unit-test/lc_watch_tests.c
@@ -508,12 +508,11 @@ void LC_ProcessWP_Test_OperatorCompareWatchFalsePreviousStale(void)
 {
     uint16             WatchIndex = 0;
     CFE_TIME_SysTime_t Timestamp;
+    CFE_SB_MsgId_t     TestMsgId = LC_UT_MID_1;
 
     Timestamp.Seconds    = 3;
     Timestamp.Subseconds = 5;
 
-    CFE_SB_MsgId_t TestMsgId = LC_UT_MID_1;
-
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
@@ -554,12 +553,11 @@ void LC_ProcessWP_Test_OperatorCompareWatchFalsePreviousTrue(void)
 {
     uint16             WatchIndex = 0;
     CFE_TIME_SysTime_t Timestamp;
+    CFE_SB_MsgId_t     TestMsgId = LC_UT_MID_1;
 
     Timestamp.Seconds    = 3;
     Timestamp.Subseconds = 5;
 
-    CFE_SB_MsgId_t TestMsgId = LC_UT_MID_1;
-
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
@@ -626,10 +624,10 @@ void LC_ProcessWP_Test_OperatorCompareWatchTruePreviousTrue(void)
 {
     uint16             WatchIndex = 0;
     CFE_TIME_SysTime_t Timestamp;
+    CFE_SB_MsgId_t     TestMsgId = LC_UT_MID_1;
 
-    Timestamp.Seconds        = 3;
-    Timestamp.Subseconds     = 5;
-    CFE_SB_MsgId_t TestMsgId = LC_UT_MID_1;
+    Timestamp.Seconds    = 3;
+    Timestamp.Subseconds = 5;
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
@@ -671,12 +669,11 @@ void LC_ProcessWP_Test_OperatorCompareWatchFalsePreviousFalse(void)
 {
     uint16             WatchIndex = 0;
     CFE_TIME_SysTime_t Timestamp;
+    CFE_SB_MsgId_t     TestMsgId = LC_UT_MID_1;
 
     Timestamp.Seconds    = 3;
     Timestamp.Subseconds = 5;
 
-    CFE_SB_MsgId_t TestMsgId = LC_UT_MID_1;
-
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
@@ -875,6 +872,8 @@ void LC_OperatorCompare_Test_DataTypeError(void)
     uint8  Result;
     uint16 WatchIndex      = 0;
     uint32 ProcessedWPData = 0;
+    int32  strCmpResult;
+    char   ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     LC_OperData.WDTPtr[WatchIndex].DataType                = 99;
     LC_OperData.WDTPtr[WatchIndex].OperatorID              = LC_OPER_LE;
@@ -884,9 +883,6 @@ void LC_OperatorCompare_Test_DataTypeError(void)
     LC_OperData.WDTPtr[WatchIndex].ComparisonValue.Float32 = 1.0;
     LC_OperData.WRTPtr[WatchIndex].EvaluationCount         = 0;
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WP has undefined data type: WP = %%d, DataType = %%d");
 
@@ -1019,12 +1015,11 @@ void LC_SignedCompare_Test_InvalidOperatorID(void)
     uint16 WatchIndex   = 0;
     int32  WPValue      = 1;
     int32  CompareValue = 0;
+    int32  strCmpResult;
+    char   ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     LC_OperData.WDTPtr[WatchIndex].OperatorID = 99;
 
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WP has invalid operator ID: WP = %%d, OperID = %%d");
 
@@ -1354,13 +1349,13 @@ void LC_FloatCompare_Test_InvalidOperatorID(void)
     uint16         WatchIndex = 0;
     LC_MultiType_t WPMultiType;
     LC_MultiType_t CompareMultiType;
+    int32          strCmpResult;
+    char           ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     WPMultiType.Float32      = 1.0;
     CompareMultiType.Float32 = 0.0;
 
     LC_OperData.WDTPtr[WatchIndex].OperatorID = 99;
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WP has invalid operator ID: WP = %%d, OperID = %%d");
@@ -1386,12 +1381,12 @@ void LC_FloatCompare_Test_NaN(void)
     uint16         WatchIndex = 0;
     LC_MultiType_t WPMultiType;
     LC_MultiType_t CompareMultiType;
+    int32          strCmpResult;
+    char           ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     WPMultiType.Float32      = 1.0;
     WPMultiType.Unsigned32   = 0x7F8FFFFF;
     CompareMultiType.Float32 = 0.0;
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WP data value is a float NAN: WP = %%d, Value = 0x%%08X");
@@ -1418,10 +1413,10 @@ void LC_WPOffsetValid_Test_DataUByte(void)
     bool           Result;
     uint16         WatchIndex = 0;
     CFE_SB_MsgId_t TestMsgId  = LC_UT_MID_1;
+    size_t         MsgSize    = 16;
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
-    size_t MsgSize = 16;
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
@@ -1443,10 +1438,10 @@ void LC_WPOffsetValid_Test_UWordLE(void)
     bool           Result;
     uint16         WatchIndex = 0;
     CFE_SB_MsgId_t TestMsgId  = LC_UT_MID_1;
+    size_t         MsgSize    = 16;
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
-    size_t MsgSize = 16;
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
@@ -1468,10 +1463,10 @@ void LC_WPOffsetValid_Test_UDWordLE(void)
     bool           Result;
     uint16         WatchIndex = 0;
     CFE_SB_MsgId_t TestMsgId  = LC_UT_MID_1;
+    size_t         MsgSize    = 16;
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
-    size_t MsgSize = 16;
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
@@ -1493,9 +1488,10 @@ void LC_WPOffsetValid_Test_FloatLE(void)
     bool           Result;
     uint16         WatchIndex = 0;
     CFE_SB_MsgId_t TestMsgId  = LC_UT_MID_1;
+    size_t         MsgSize    = 16;
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
-    size_t MsgSize = 16;
+
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
@@ -1517,12 +1513,12 @@ void LC_WPOffsetValid_Test_DataTypeError(void)
     bool           Result;
     uint16         WatchIndex = 0;
     CFE_SB_MsgId_t TestMsgId  = LC_UT_MID_1;
+    int32          strCmpResult;
+    char           ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WP has undefined data type: WP = %%d, DataType = %%d");
@@ -1554,14 +1550,15 @@ void LC_WPOffsetValid_Test_OffsetError(void)
     bool           Result;
     uint16         WatchIndex = 0;
     CFE_SB_MsgId_t TestMsgId  = LC_UT_MID_1;
+    size_t         MsgSize    = 0;
+    int32          strCmpResult;
+    char           ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
-    size_t MsgSize = 0;
+
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false);
 
     UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true);
-    int32 strCmpResult;
-    char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WP offset error: MID = 0x%%08lX, WP = %%d, Offset = %%d, DataSize = %%d, MsgLen = %%d");
@@ -1856,12 +1853,11 @@ void LC_ValidateWDT_Test_AllDataTypes(void)
     int32 TableIndex;
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
+    char  ExpectedEventString2[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WDT verify err: WP = %%d, Err = %%d, DType = %%d, Oper = %%d, MID = 0x%%08lX");
 
-    char ExpectedEventString2[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString2, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WDT verify results: good = %%d, bad = %%d, unused = %%d");
 
@@ -1913,12 +1909,11 @@ void LC_ValidateWDT_Test_AllOperatorIDs(void)
 
     int32 strCmpResult;
     char  ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
+    char  ExpectedEventString2[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
 
     snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WDT verify err: WP = %%d, Err = %%d, DType = %%d, Oper = %%d, MID = 0x%%08lX");
 
-    char ExpectedEventString2[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
-
     snprintf(ExpectedEventString2, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
              "WDT verify results: good = %%d, bad = %%d, unused = %%d");