Patch Set 1: Looks good to me, but someone else must approve; IP review completed

We almost have 100% code coverage in these tests.  The next patch brings it to 100% when it finishes the Ref changes that make that level of testing easily possible.  I didn't see any value in writing tests here, just to discard them in the very next commit with something slightly different.