Improve expect snippets

Hey, I think this makes the a little more useful