Added user friendships and associated tests