Added id_token to Bearer token, modified unittest to reflect the changes