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)