Fix cucumber tests to pass