Advice on writing better Cucumber Gherkin scenarios