refactored Cucumber tests