Cleaning up a couple more tests.

This cleans up a couple of text changes made for a different pull request, and makes a bit of progress in the 'other' group of cucumber tests.