adding cucumber tests
fix conflict in Gemfile.lock