Fix up cucumber tests to match refactor