Fix cucumber tests, part 1