Port latest batch of cukes from master to gh

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

/cc @jingweno
I would use a guard condition here to avoid deep nesting blocks:

```go
if err != nil {
  continue
}
```