Added some more test scenarios