cucumber tests for 1st iteration
Merge branch 'jeff'