Index: App/Common.h
===================================================================
diff -u -rcda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd -r54ab19a7ac15f6ef2628c96661a7d6cc35ea12d0
--- App/Common.h	(.../Common.h)	(revision cda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd)
+++ App/Common.h	(.../Common.h)	(revision 54ab19a7ac15f6ef2628c96661a7d6cc35ea12d0)
@@ -32,12 +32,12 @@
 
 typedef float                    F32;
 typedef double                   F64;
-typedef unsigned long int        U32;
-typedef long int                 S32;
+typedef unsigned int             U32;
+typedef int                      S32;
 typedef unsigned short           U16;
 typedef short                    S16;
 typedef unsigned char            U08;
-typedef unsigned long int        BOOL;
+typedef unsigned int             BOOL;
 typedef unsigned char            BYTE;
 
 typedef enum Pin_Signal_States
Index: App/Services/SystemCommMessages.c
===================================================================
diff -u -r0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00 -r54ab19a7ac15f6ef2628c96661a7d6cc35ea12d0
--- App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00)
+++ App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 54ab19a7ac15f6ef2628c96661a7d6cc35ea12d0)
@@ -264,14 +264,14 @@
 void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_CARGO_T cargo;
-    BOOL result;
+    BOOL result = FALSE;
 
     // verify cargo length
-    if ( SIZE_OF_TEST_OVERRIDE_CARGO_T == message->hdr.cargoLen )
+    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
 
-        if ( FALSE == (BOOL)(cargo.reset) )
+        if ( FALSE == cargo.reset )
         {
             result = testSetOffButtonStateOverride( (BUTTON_STATE_T)(cargo.state) );
         }
@@ -297,14 +297,14 @@
 void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_CARGO_T cargo;
-    BOOL result;
+    BOOL result = FALSE;
 
     // verify cargo length
-    if ( SIZE_OF_TEST_OVERRIDE_CARGO_T == message->hdr.cargoLen )
+    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
 
-        if ( FALSE == (BOOL)(cargo.reset) )
+        if ( FALSE == cargo.reset )
         {
             result = testSetStopButtonStateOverride( (BUTTON_STATE_T)(cargo.state) );
         }
@@ -330,14 +330,14 @@
 void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_CARGO_T cargo;
-    BOOL result;
+    BOOL result = FALSE;
 
     // verify cargo length
-    if ( SIZE_OF_TEST_OVERRIDE_CARGO_T == message->hdr.cargoLen )
+    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
 
-        if ( FALSE == (BOOL)(cargo.reset) )
+        if ( FALSE == cargo.reset )
         {
             result = testSetCurrentLampPatternOverride( (LAMP_PATTERN_T)(cargo.state) );
         }
@@ -363,14 +363,14 @@
 void handleTestWatchdogCheckInStateOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_CARGO_T cargo;
-    BOOL result;
+    BOOL result = FALSE;
 
     // verify cargo length
-    if ( SIZE_OF_TEST_OVERRIDE_ARRAY_CARGO_T == message->hdr.cargoLen )
+    if ( sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) );
 
-        if ( FALSE == (BOOL)(cargo.reset) )
+        if ( FALSE == cargo.reset )
         {
             result = testSetWatchdogTaskCheckInOverride( cargo.index, (BOOL)(cargo.state) );
         }
Index: App/TestSupport.h
===================================================================
diff -u -r0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00 -r54ab19a7ac15f6ef2628c96661a7d6cc35ea12d0
--- App/TestSupport.h	(.../TestSupport.h)	(revision 0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00)
+++ App/TestSupport.h	(.../TestSupport.h)	(revision 54ab19a7ac15f6ef2628c96661a7d6cc35ea12d0)
@@ -26,18 +26,16 @@
 
 typedef struct
 {
-    U08 reset;
+    BOOL reset;
     U32 state;
 } TEST_OVERRIDE_CARGO_T;
-#define SIZE_OF_TEST_OVERRIDE_CARGO_T   5
 
 typedef struct
 {
-    U08 reset;
+    BOOL reset;
     U32 state;
     U32 index;
 } TEST_OVERRIDE_ARRAY_CARGO_T;
-#define SIZE_OF_TEST_OVERRIDE_ARRAY_CARGO_T   9
 
 #pragma pack(pop)