Fix cucumber tests
More cucumber fixes