Refactored some Cucumber tests