Added some test scenarios