More improvements to test coverage.