Index: App/TestSupport.h
===================================================================
diff -u -rcda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd -r0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00
--- App/TestSupport.h	(.../TestSupport.h)	(revision cda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd)
+++ App/TestSupport.h	(.../TestSupport.h)	(revision 0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00)
@@ -29,13 +29,15 @@
     U08 reset;
     U32 state;
 } TEST_OVERRIDE_CARGO_T;
+#define SIZE_OF_TEST_OVERRIDE_CARGO_T   5
 
 typedef struct
 {
     U08 reset;
     U32 state;
     U32 index;
 } TEST_OVERRIDE_ARRAY_CARGO_T;
+#define SIZE_OF_TEST_OVERRIDE_ARRAY_CARGO_T   9
 
 #pragma pack(pop)