Index: TestSupport.h
===================================================================
diff -u -rf4ee38d0f7a18e47e6e4980360a7eac9220d244a -r589f372c79bfe50487806e07161552bea6e7a09c
--- TestSupport.h	(.../TestSupport.h)	(revision f4ee38d0f7a18e47e6e4980360a7eac9220d244a)
+++ TestSupport.h	(.../TestSupport.h)	(revision 589f372c79bfe50487806e07161552bea6e7a09c)
@@ -45,6 +45,22 @@
 
 #pragma pack(pop)
 
+typedef struct \
+{ \
+    U32 data; \
+    U32 ovInitData; \
+    U32 ovData; \
+    U32 override; \
+} OVERRIDE_U32_T;
+
+typedef struct \
+{ \
+    F32 data; \
+    F32 ovInitData; \
+    F32 ovData; \
+    U32 override; \
+} OVERRIDE_F32_T;
+
 // DATA_DECL - declares an overrideable data variable
 // t        = data's type
 // t_name   = name for data's structure type
@@ -171,7 +187,7 @@
 BOOL o_name( U32 i_name, t value ) \
 { \
     BOOL result = FALSE; \
-    if ( i_name <= max ) \
+    if ( i_name < max ) \
     { \
         if ( TRUE == isTestingActivated() ) \
         { \
@@ -185,7 +201,7 @@
 BOOL r_name( U32 i_name ) \
 { \
     BOOL result = FALSE; \
-    if ( i_name <= max ) \
+    if ( i_name < max ) \
     { \
         if ( TRUE == isTestingActivated() ) \
         { \