Adding more test cases round 2