Cucumber test fixes.