Port latest batch of cukes from master to gh

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

/cc @jingweno
I don't have a problem with that but I have some ideas on improving this a bit. I could give it a shot in another PR :smile_cat: