Added more tests to improve code coverage