Fixed rspec helpers and added mocha