Fixed rspec
Merge the cucumber fix and rspec fix