Fine-tuned Cucumber scripts