I have created scaffolding for the cucumber tests, and made small changes to feature files to make them cohesive.