Fixed rspec issues