Improve Rspec files