The patch to the test code looks fine, although there are some style issues.  Some lines over 80 columns and there needs to be spaces around = and other binary operators.

I need to review the C code changes, but this patch looks interesting.  

Roger, in the future, can you make a single patch with all the files.  It's easier to download and apply one patch with multiple files than 3 diff patches.