Improve test coverage.
Merge branch 'hotfix/2.1.2'