Verification with Test P again works just fine.  But this is not a regression test yet.
I cannot currently tell what I am doing with this commit.