More unit test coverage and doc cosmetics