Updated the test cases as per the code review comments