Feature/upgrade rspec