clean up before trying RSpec

simplified, unified, tidied prior to trying the RSpec version of the
Cucumber tests