Updated Cucumber tests