Cucumber tests fixed