Use `email2` instead of `email_question` and support arrays in `email` too
Tidy up specs