Fixing previous commit & wrote rspec to make code pass