Added Cucumber tests