Updated solutions and rspec files