Fix specs for rspec upgrade