rspec improvements