Cucumber cukes refactored