Also: - minor improvements to documentation - wrap one of our test error messages in a manner more consistent with other messages