Added more Cucumber tests