Miscellaneous edits to the new library, to support testing

[davidcok]

By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.