Index: firmware/App/TestSupport.h
===================================================================
diff -u -r1f3647830e9de0a1f0a4e445ce8d72d5525f51fb -r90f6438e80dbe0a32472a076a0d1bc54db65d15a
--- firmware/App/TestSupport.h	(.../TestSupport.h)	(revision 1f3647830e9de0a1f0a4e445ce8d72d5525f51fb)
+++ firmware/App/TestSupport.h	(.../TestSupport.h)	(revision 90f6438e80dbe0a32472a076a0d1bc54db65d15a)
@@ -28,14 +28,14 @@
 {
     BOOL reset;
     U32 state;
-} TEST_OVERRIDE_CARGO_T;
+} TEST_OVERRIDE_PAYLOAD_T;
 
 typedef struct
 {
     BOOL reset;
     U32 state;
     U32 index;
-} TEST_OVERRIDE_ARRAY_CARGO_T;
+} TEST_OVERRIDE_ARRAY_PAYLOAD_T;
 
 #pragma pack(pop)
 
@@ -120,7 +120,7 @@
     } \
     else \
     { \
-        activateAlarm( ALARM_ID_SOFTWARE_FAULT ); \
+        activateAlarmNoData( ALARM_ID_SOFTWARE_FAULT ); \
     } \
     return result; \
 }
@@ -199,15 +199,15 @@
 #define DATA_OVERRIDE_HANDLER_FUNC( t, h_name, o_name, r_name ) \
 void h_name( MESSAGE_T *message ) \
 { \
-    TEST_OVERRIDE_CARGO_T cargo; \
+    TEST_OVERRIDE_PAYLOAD_T payload; \
     BOOL result = FALSE; \
-    /* verify cargo length */ \
-    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen ) \
+    /* verify payload length */ \
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) \
     { \
-        memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) ); \
-        if ( FALSE == cargo.reset ) \
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); \
+        if ( FALSE == payload.reset ) \
         { \
-            result = o_name( (t)(cargo.state) ); \
+            result = o_name( (t)(payload.state) ); \
         } \
         else \
         { \
@@ -226,19 +226,19 @@
 #define DATA_ARRAY_OVERRIDE_HANDLER_FUNC( t, h_name, o_name, r_name ) \
 void h_name( MESSAGE_T *message ) \
 { \
-    TEST_OVERRIDE_ARRAY_CARGO_T cargo; \
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; \
     BOOL result = FALSE; \
-    /* verify cargo length */ \
-    if ( sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) == message->hdr.cargoLen ) \
+    /* verify payload length */ \
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen ) \
     { \
-        memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) ); \
-        if ( FALSE == cargo.reset ) \
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) ); \
+        if ( FALSE == payload.reset ) \
         { \
-            result = o_name( cargo.index, (t)(cargo.state) ); \
+            result = o_name( payload.index, (t)(payload.state) ); \
         } \
         else \
         { \
-            result = r_name( cargo.index ); \
+            result = r_name( payload.index ); \
         } \
     } \
     /* respond to request */ \