Improve test coverage.
Merge branch 'refs/heads/master' into topics/improve-coverage