changes per PR comments.
more code coverage.