Added more tests for 100% test coverage