1814 mark

A bunch of clean-up to the cucumber test steps.