Added 7 more scenarios