add cucumber tests
merge Gemfile