Adding scenario tests