Added new test cases to cover the scenarios