Fixed encapusulation between classes. Updated Rspec