Port latest batch of cukes from master to gh

:warning: This is my work in progress; some cukes still fail

/cc @jingweno
Good catch! I think I meant to say `\s`. You fix is even more accurate