Having looked that the changes to the test (below) I'm finding the duplication a bit too DRY-violating.  I think I'll re-work the test for the HTML wrapping into usage. Or failing that, if I can, test /just/ that the wrapping works, rather than run All The Tests yet again for that one feature.