Rspec3 upgrade