Added more tests for coverage.