Added more tests for code coverage.