Added user and user friendships with associated tests