• Use nitems instead of handrolling the macro
• Use a separate variable for tracking the testcase count instead of hardcoding the offset for the testcases

MFC after: 3 days
Sponsored by: EMC / Isilon Storage Division