Fix Cucumber tests