Improved test suite coverage.