RSpec improvements