Refactoring cukes: Pull OurHelpers into its own file
Extract step defs into their own file