Improved test coverage, docs.