Cucumber tests
Merge branch 'cucumber'