#100: Add test cases to increase the code coverage from 83% to 95%