Added few more test scenarios