Expand unit test coverage.