Added more tests to achieve 100% coverage