Improve rspec