helper -> expect
Add expect events support
update yo to expect syntax