#33 Added test cases for the bug fix