Adding more tests for coverage