More Cucumber test refactorings