added shoulda
added user_friendship