added user friendships and tests