Patch broken tests

A while ago I refactored all the cucumber tests to be clearer and improve coverage. This broke a few things.
This pull request includes code to complete a lot of that work, and marks tests which cover previously uncovered bugs as pending, so that the build passes.

Note, nothing new is broken, it's just now detected.