Fixed depreciations and horrible rspec errors