Made minor changes related to tests and code coverage.