merge rspec & cucumber tests