Added new test scenarios