Added more test scenarios