Added a few test scenarios