Added shoulda and user_friendship model