Added shoulda to test group and update UserFriendship model