BTW, I've almost got the inclusion tests revived and working.  Where do you want them?

Seems reasonable to add them here, so I could put them on this branch and do a PR to your repo.

What's your preference?