Add scenarios where possible
A bit awkward, but better fix for #22
Merge branch 'master' into provided