Added extra test scenarios