Fix cucumber tests