From c84b9cbc97584bea2aff79758e775265993c0cbc Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Sun, 3 Mar 2024 23:44:59 +0000
Subject: [PATCH] upgrade: Allow payment by invoice.

---
 corporate/lib/stripe.py                       |   79 +-
 corporate/lib/stripe_event_handler.py         |   17 +-
 .../add_minimum_licenses--Charge.list.1.json  |    6 +-
 ...d_minimum_licenses--Customer.modify.1.json |    2 +-
 ...minimum_licenses--Customer.retrieve.1.json |    5 +-
 ...minimum_licenses--Customer.retrieve.2.json |    5 +-
 ...minimum_licenses--Customer.retrieve.3.json |    5 +-
 ...minimum_licenses--Customer.retrieve.4.json |    5 +-
 .../add_minimum_licenses--Event.list.1.json   |    6 +-
 .../add_minimum_licenses--Event.list.2.json   |  189 +-
 .../add_minimum_licenses--Event.list.3.json   |  379 +++-
 .../add_minimum_licenses--Event.list.4.json   |  369 +---
 ...dd_minimum_licenses--Invoice.create.1.json |    3 +-
 ..._licenses--Invoice.finalize_invoice.1.json |    7 +-
 .../add_minimum_licenses--Invoice.pay.1.json  |    5 +-
 ...inimum_licenses--SetupIntent.create.1.json |    8 +-
 ..._minimum_licenses--SetupIntent.list.1.json |    4 +-
 ...imum_licenses--SetupIntent.retrieve.1.json |    8 +-
 ...m_licenses--checkout.Session.create.1.json |   12 +-
 ...mum_licenses--checkout.Session.list.1.json |   12 +-
 ...tach_discount_to_realm--Charge.list.1.json |    6 +-
 ...tach_discount_to_realm--Charge.list.2.json |   12 +-
 ..._discount_to_realm--Customer.modify.1.json |    2 +-
 ..._discount_to_realm--Customer.modify.2.json |    2 +-
 ...iscount_to_realm--Customer.retrieve.1.json |    5 +-
 ...iscount_to_realm--Customer.retrieve.2.json |    5 +-
 ...iscount_to_realm--Customer.retrieve.3.json |    5 +-
 ...iscount_to_realm--Customer.retrieve.4.json |    5 +-
 ...iscount_to_realm--Customer.retrieve.5.json |    5 +-
 ...iscount_to_realm--Customer.retrieve.6.json |    5 +-
 ...iscount_to_realm--Customer.retrieve.7.json |    5 +-
 ...iscount_to_realm--Customer.retrieve.8.json |    5 +-
 ...ttach_discount_to_realm--Event.list.1.json |    6 +-
 ...ttach_discount_to_realm--Event.list.2.json |  189 +-
 ...ttach_discount_to_realm--Event.list.3.json |   31 +-
 ...ttach_discount_to_realm--Event.list.5.json |    8 +-
 ...ttach_discount_to_realm--Event.list.6.json |   65 +-
 ...ttach_discount_to_realm--Event.list.7.json |   31 +-
 ...h_discount_to_realm--Invoice.create.1.json |    3 +-
 ...h_discount_to_realm--Invoice.create.2.json |    3 +-
 ...h_discount_to_realm--Invoice.create.3.json |    3 +-
 ..._to_realm--Invoice.finalize_invoice.1.json |    7 +-
 ..._to_realm--Invoice.finalize_invoice.2.json |    7 +-
 ..._to_realm--Invoice.finalize_invoice.3.json |    5 +-
 ...ach_discount_to_realm--Invoice.list.2.json |    5 +-
 ...ach_discount_to_realm--Invoice.list.4.json |   10 +-
 ...ach_discount_to_realm--Invoice.list.5.json |   15 +-
 ...tach_discount_to_realm--Invoice.pay.1.json |    5 +-
 ...tach_discount_to_realm--Invoice.pay.2.json |    5 +-
 ...scount_to_realm--SetupIntent.create.1.json |    8 +-
 ...scount_to_realm--SetupIntent.create.2.json |    8 +-
 ...discount_to_realm--SetupIntent.list.1.json |    4 +-
 ...discount_to_realm--SetupIntent.list.2.json |    4 +-
 ...ount_to_realm--SetupIntent.retrieve.1.json |    8 +-
 ...ount_to_realm--SetupIntent.retrieve.2.json |    8 +-
 ...t_to_realm--checkout.Session.create.1.json |   12 +-
 ...t_to_realm--checkout.Session.create.2.json |   12 +-
 ...unt_to_realm--checkout.Session.list.1.json |   12 +-
 ...unt_to_realm--checkout.Session.list.2.json |   12 +-
 ...g_page_permissions--Customer.modify.1.json |    2 +-
 ...page_permissions--Customer.retrieve.1.json |    5 +-
 ...page_permissions--Customer.retrieve.2.json |    5 +-
 ...page_permissions--Customer.retrieve.3.json |    5 +-
 ...page_permissions--Customer.retrieve.4.json |    5 +-
 ...page_permissions--Customer.retrieve.5.json |    5 +-
 ...page_permissions--Customer.retrieve.6.json |    5 +-
 ...illing_page_permissions--Event.list.1.json |    6 +-
 ...illing_page_permissions--Event.list.2.json |   71 +-
 ...illing_page_permissions--Event.list.3.json |   27 +-
 ...ng_page_permissions--Invoice.create.1.json |    3 +-
 ...rmissions--Invoice.finalize_invoice.1.json |    7 +-
 ...lling_page_permissions--Invoice.pay.1.json |    5 +-
 ...age_permissions--SetupIntent.create.1.json |    8 +-
 ..._page_permissions--SetupIntent.list.1.json |    4 +-
 ...e_permissions--SetupIntent.retrieve.1.json |    8 +-
 ...ermissions--checkout.Session.create.1.json |   12 +-
 ..._permissions--checkout.Session.list.1.json |   12 +-
 ..._but_payment_fails--Customer.modify.1.json |    2 +-
 ...ut_payment_fails--Customer.retrieve.1.json |    5 +-
 ...ut_payment_fails--Customer.retrieve.2.json |    5 +-
 ...ut_payment_fails--Customer.retrieve.3.json |    5 +-
 ...tomer_but_payment_fails--Event.list.1.json |    6 +-
 ...r_but_payment_fails--Invoice.create.1.json |    3 +-
 ...ent_fails--Invoice.finalize_invoice.1.json |    7 +-
 ...omer_but_payment_fails--Invoice.pay.1.json |   43 +-
 ...payment_fails--Invoice.void_invoice.1.json |    5 +-
 ...t_payment_fails--SetupIntent.create.1.json |    8 +-
 ...but_payment_fails--SetupIntent.list.1.json |    6 +-
 ...payment_fails--SetupIntent.retrieve.1.json |    8 +-
 ...ment_fails--checkout.Session.create.1.json |   14 +-
 ...ayment_fails--checkout.Session.list.1.json |   14 +-
 ...om_standard_to_plus--Invoice.create.1.json |    3 +-
 ...d_to_plus--Invoice.finalize_invoice.1.json |    7 +-
 ...from_standard_to_plus--Invoice.list.1.json |    7 +-
 ...upgrade_parameters--Customer.modify.1.json |    2 +-
 ...upgrade_parameters--Customer.modify.2.json |    2 +-
 ...upgrade_parameters--Customer.modify.3.json |    2 +-
 ...upgrade_parameters--Customer.modify.4.json |    2 +-
 ...upgrade_parameters--Customer.modify.5.json |    2 +-
 ...upgrade_parameters--Customer.modify.6.json |    2 +-
 ...upgrade_parameters--Customer.modify.7.json |    2 +-
 ...upgrade_parameters--Customer.modify.8.json |    2 +-
 ...upgrade_parameters--Customer.modify.9.json |    2 +-
 ...grade_parameters--Customer.retrieve.1.json |    5 +-
 ...rade_parameters--Customer.retrieve.10.json |    5 +-
 ...rade_parameters--Customer.retrieve.11.json |    5 +-
 ...rade_parameters--Customer.retrieve.12.json |    5 +-
 ...rade_parameters--Customer.retrieve.13.json |    5 +-
 ...rade_parameters--Customer.retrieve.14.json |    5 +-
 ...rade_parameters--Customer.retrieve.15.json |    5 +-
 ...rade_parameters--Customer.retrieve.16.json |    5 +-
 ...rade_parameters--Customer.retrieve.17.json |    5 +-
 ...rade_parameters--Customer.retrieve.18.json |    5 +-
 ...grade_parameters--Customer.retrieve.2.json |    5 +-
 ...grade_parameters--Customer.retrieve.3.json |    5 +-
 ...grade_parameters--Customer.retrieve.4.json |    5 +-
 ...grade_parameters--Customer.retrieve.5.json |    5 +-
 ...grade_parameters--Customer.retrieve.6.json |    5 +-
 ...grade_parameters--Customer.retrieve.7.json |    5 +-
 ...grade_parameters--Customer.retrieve.8.json |    5 +-
 ...grade_parameters--Customer.retrieve.9.json |    5 +-
 ...rade_parameters--SetupIntent.create.1.json |    8 +-
 ...rade_parameters--SetupIntent.create.2.json |    8 +-
 ...rade_parameters--SetupIntent.create.3.json |    8 +-
 ...rade_parameters--SetupIntent.create.4.json |    8 +-
 ...rade_parameters--SetupIntent.create.5.json |    8 +-
 ...rade_parameters--SetupIntent.create.6.json |    8 +-
 ...rade_parameters--SetupIntent.create.7.json |    8 +-
 ...rade_parameters--SetupIntent.create.8.json |    8 +-
 ...rade_parameters--SetupIntent.create.9.json |    8 +-
 ...pgrade_parameters--SetupIntent.list.1.json |    4 +-
 ...pgrade_parameters--SetupIntent.list.2.json |    4 +-
 ...pgrade_parameters--SetupIntent.list.3.json |    4 +-
 ...pgrade_parameters--SetupIntent.list.4.json |    4 +-
 ...pgrade_parameters--SetupIntent.list.5.json |    4 +-
 ...pgrade_parameters--SetupIntent.list.6.json |    4 +-
 ...pgrade_parameters--SetupIntent.list.7.json |    6 +-
 ...pgrade_parameters--SetupIntent.list.8.json |    6 +-
 ...pgrade_parameters--SetupIntent.list.9.json |    6 +-
 ...de_parameters--SetupIntent.retrieve.1.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.2.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.3.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.4.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.5.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.6.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.7.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.8.json |    8 +-
 ...de_parameters--SetupIntent.retrieve.9.json |    8 +-
 ...parameters--checkout.Session.create.1.json |   12 +-
 ...parameters--checkout.Session.create.2.json |   12 +-
 ...parameters--checkout.Session.create.3.json |   12 +-
 ...parameters--checkout.Session.create.4.json |   12 +-
 ...parameters--checkout.Session.create.5.json |   12 +-
 ...parameters--checkout.Session.create.6.json |   12 +-
 ...parameters--checkout.Session.create.7.json |   14 +-
 ...parameters--checkout.Session.create.8.json |   14 +-
 ...parameters--checkout.Session.create.9.json |   14 +-
 ...e_parameters--checkout.Session.list.1.json |   12 +-
 ...e_parameters--checkout.Session.list.2.json |   12 +-
 ...e_parameters--checkout.Session.list.3.json |   12 +-
 ...e_parameters--checkout.Session.list.4.json |   12 +-
 ...e_parameters--checkout.Session.list.5.json |   12 +-
 ...e_parameters--checkout.Session.list.6.json |   12 +-
 ...e_parameters--checkout.Session.list.7.json |   14 +-
 ...e_parameters--checkout.Session.list.8.json |   14 +-
 ...e_parameters--checkout.Session.list.9.json |   14 +-
 ...ult_payment_method--Customer.modify.1.json |    2 +-
 ...t_payment_method--Customer.retrieve.2.json |    5 +-
 ...t_payment_method--Customer.retrieve.3.json |    5 +-
 ...t_payment_method--Customer.retrieve.4.json |    5 +-
 ...t_payment_method--Customer.retrieve.5.json |    5 +-
 ...t_payment_method--Customer.retrieve.6.json |    5 +-
 ..._default_payment_method--Event.list.1.json |    6 +-
 ..._default_payment_method--Event.list.2.json |   73 +-
 ..._default_payment_method--Event.list.3.json |   29 +-
 ...ault_payment_method--Invoice.create.1.json |    3 +-
 ...nt_method--Invoice.finalize_invoice.1.json |    7 +-
 ...default_payment_method--Invoice.pay.1.json |    5 +-
 ..._payment_method--SetupIntent.create.1.json |    8 +-
 ...lt_payment_method--SetupIntent.list.1.json |    4 +-
 ...ayment_method--SetupIntent.retrieve.1.json |    8 +-
 ...ent_method--checkout.Session.create.1.json |   12 +-
 ...yment_method--checkout.Session.list.1.json |   12 +-
 ...id_open_invoices--Customer.retrieve.1.json |   33 +
 ..._and_void_open_invoices--Event.list.1.json |  185 +-
 ..._and_void_open_invoices--Event.list.2.json | 1014 ++++++++++
 ..._and_void_open_invoices--Event.list.3.json |  385 ++++
 ...and_void_open_invoices--Event.list.4.json} |    0
 ..._void_open_invoices--Invoice.create.1.json |   16 +-
 ..._void_open_invoices--Invoice.create.2.json |  163 ++
 ..._invoices--Invoice.finalize_invoice.1.json |   22 +-
 ...invoices--Invoice.finalize_invoice.2.json} |   51 +-
 ...nd_void_open_invoices--Invoice.list.1.json |  191 +-
 ...and_void_open_invoices--Invoice.pay.1.json |  169 ++
 ...open_invoices--Invoice.void_invoice.1.json |   20 +-
 ...d_open_invoices--InvoiceItem.create.1.json |    6 +-
 ...d_open_invoices--InvoiceItem.create.2.json |   47 +
 ..._payments_as_needed--Invoice.create.1.json |    3 +-
 ..._payments_as_needed--Invoice.create.2.json |    3 +-
 ..._payments_as_needed--Invoice.create.3.json |    3 +-
 ..._payments_as_needed--Invoice.create.4.json |    3 +-
 ..._payments_as_needed--Invoice.create.5.json |    3 +-
 ..._payments_as_needed--Invoice.create.6.json |    3 +-
 ..._payments_as_needed--Invoice.create.7.json |    3 +-
 ..._payments_as_needed--Invoice.create.8.json |    3 +-
 ...as_needed--Invoice.finalize_invoice.1.json |    7 +-
 ...as_needed--Invoice.finalize_invoice.2.json |    7 +-
 ...as_needed--Invoice.finalize_invoice.3.json |    7 +-
 ...as_needed--Invoice.finalize_invoice.4.json |    5 +-
 ...as_needed--Invoice.finalize_invoice.5.json |    7 +-
 ...as_needed--Invoice.finalize_invoice.6.json |    7 +-
 ...as_needed--Invoice.finalize_invoice.7.json |    7 +-
 ...as_needed--Invoice.finalize_invoice.8.json |    7 +-
 ...n_payments_as_needed--Invoice.list.10.json |   10 +-
 ...n_payments_as_needed--Invoice.list.12.json |    5 +-
 ...n_payments_as_needed--Invoice.list.13.json |    5 +-
 ...n_payments_as_needed--Invoice.list.14.json |    5 +-
 ...n_payments_as_needed--Invoice.list.15.json |   10 +-
 ...on_payments_as_needed--Invoice.list.2.json |    5 +-
 ...on_payments_as_needed--Invoice.list.3.json |    5 +-
 ...on_payments_as_needed--Invoice.list.6.json |    5 +-
 ...on_payments_as_needed--Invoice.list.7.json |   10 +-
 ...on_payments_as_needed--Invoice.list.8.json |   10 +-
 ..._on_payments_as_needed--Invoice.pay.1.json |    5 +-
 ..._on_payments_as_needed--Invoice.pay.2.json |    5 +-
 ...nts_as_needed--Invoice.void_invoice.1.json |    5 +-
 ...nts_as_needed--Invoice.void_invoice.2.json |    5 +-
 ...nts_as_needed--Invoice.void_invoice.3.json |    5 +-
 ...ixed_price_plans--Customer.retrieve.1.json |   33 +
 .../fixed_price_plans--Event.list.1.json      |   65 +-
 ...n => fixed_price_plans--Event.list.2.json} | 1752 ++++++-----------
 ...n => fixed_price_plans--Event.list.3.json} |  167 +-
 ...n => fixed_price_plans--Event.list.4.json} |    0
 .../fixed_price_plans--Invoice.create.1.json  |    8 +-
 .../fixed_price_plans--Invoice.create.2.json  |    7 +-
 ...ice_plans--Invoice.finalize_invoice.1.json |   12 +-
 ...ice_plans--Invoice.finalize_invoice.2.json |   13 +-
 .../fixed_price_plans--Invoice.list.1.json    |   37 +-
 ... => fixed_price_plans--Invoice.pay.1.json} |   51 +-
 ...xed_price_plans--InvoiceItem.create.1.json |    4 +-
 ...xed_price_plans--InvoiceItem.create.2.json |    4 +-
 ...ve_legacy_customer--Customer.create.1.json |    6 +-
 ...ve_legacy_customer--Customer.modify.1.json |    8 +-
 ..._legacy_customer--Customer.retrieve.1.json |   16 +-
 ..._legacy_customer--Customer.retrieve.2.json |   16 +-
 ..._legacy_customer--Customer.retrieve.3.json |   16 +-
 ..._legacy_customer--Customer.retrieve.4.json |   16 +-
 ..._legacy_customer--Customer.retrieve.5.json |   16 +-
 ..._active_legacy_customer--Event.list.1.json |   16 +-
 ..._active_legacy_customer--Event.list.2.json |  448 +++--
 ..._active_legacy_customer--Event.list.3.json |  376 +++-
 ..._active_legacy_customer--Event.list.4.json |  237 +--
 ...ive_legacy_customer--Invoice.create.1.json |   46 +-
 ..._customer--Invoice.finalize_invoice.1.json |   58 +-
 ...active_legacy_customer--Invoice.pay.1.json |   62 +-
 ...legacy_customer--InvoiceItem.create.1.json |   16 +-
 ...legacy_customer--InvoiceItem.create.2.json |   16 +-
 ...legacy_customer--SetupIntent.create.1.json |   12 +-
 ...e_legacy_customer--SetupIntent.list.1.json |    8 +-
 ...gacy_customer--SetupIntent.retrieve.1.json |   12 +-
 ...y_customer--checkout.Session.create.1.json |   20 +-
 ...acy_customer--checkout.Session.list.1.json |   20 +-
 ...ed_legacy_customer--Customer.modify.1.json |    2 +-
 ..._legacy_customer--Customer.retrieve.1.json |    4 +-
 ..._legacy_customer--Customer.retrieve.2.json |    4 +-
 ..._legacy_customer--Customer.retrieve.3.json |    4 +-
 ..._legacy_customer--Customer.retrieve.4.json |    4 +-
 ..._legacy_customer--Customer.retrieve.5.json |    4 +-
 ...r_ended_legacy_customer--Event.list.1.json |    6 +-
 ...r_ended_legacy_customer--Event.list.2.json |  190 +-
 ...r_ended_legacy_customer--Event.list.3.json |  252 ++-
 ...r_ended_legacy_customer--Event.list.4.json |  237 +--
 ...ded_legacy_customer--Invoice.create.1.json |    2 +-
 ..._customer--Invoice.finalize_invoice.1.json |    6 +-
 ..._ended_legacy_customer--Invoice.pay.1.json |    4 +-
 ...legacy_customer--SetupIntent.create.1.json |    8 +-
 ...d_legacy_customer--SetupIntent.list.1.json |    4 +-
 ...gacy_customer--SetupIntent.retrieve.1.json |    8 +-
 ...y_customer--checkout.Session.create.1.json |   14 +-
 ...acy_customer--checkout.Session.list.1.json |   14 +-
 ...al_upgrade_by_card--Customer.modify.1.json |    2 +-
 ..._upgrade_by_card--Customer.retrieve.2.json |    5 +-
 ..._upgrade_by_card--Customer.retrieve.3.json |    5 +-
 ..._upgrade_by_card--Customer.retrieve.4.json |    5 +-
 ..._upgrade_by_card--Customer.retrieve.5.json |    5 +-
 ..._upgrade_by_card--Customer.retrieve.6.json |    5 +-
 ..._upgrade_by_card--Customer.retrieve.7.json |    5 +-
 ...e_trial_upgrade_by_card--Event.list.1.json |  210 +-
 ...e_trial_upgrade_by_card--Event.list.2.json |   10 +-
 ...ial_upgrade_by_card--Invoice.create.1.json |   15 +-
 ...ial_upgrade_by_card--Invoice.create.2.json |   15 +-
 ...ial_upgrade_by_card--Invoice.create.3.json |   15 +-
 ...e_by_card--Invoice.finalize_invoice.1.json |   21 +-
 ...e_by_card--Invoice.finalize_invoice.2.json |   21 +-
 ...e_by_card--Invoice.finalize_invoice.3.json |   21 +-
 ...trial_upgrade_by_card--Invoice.list.4.json |   21 +-
 ...trial_upgrade_by_card--Invoice.list.5.json |   21 +-
 ...trial_upgrade_by_card--Invoice.list.6.json |   38 +-
 ...trial_upgrade_by_card--Invoice.list.7.json |   59 +-
 ...upgrade_by_card--InvoiceItem.create.1.json |    8 +-
 ...upgrade_by_card--InvoiceItem.create.2.json |    8 +-
 ...upgrade_by_card--InvoiceItem.create.3.json |    8 +-
 ...upgrade_by_card--SetupIntent.create.1.json |    8 +-
 ...l_upgrade_by_card--SetupIntent.list.1.json |    6 +-
 ...grade_by_card--SetupIntent.retrieve.1.json |    8 +-
 ...de_by_card--checkout.Session.create.1.json |   14 +-
 ...rade_by_card--checkout.Session.list.1.json |   14 +-
 ...rial_upgrade_by_invoice--Event.list.1.json |   15 +-
 ..._upgrade_by_invoice--Invoice.create.1.json |    7 +-
 ..._upgrade_by_invoice--Invoice.create.2.json |    7 +-
 ...y_invoice--Invoice.finalize_invoice.1.json |   11 +-
 ...y_invoice--Invoice.finalize_invoice.2.json |   11 +-
 ...al_upgrade_by_invoice--Invoice.list.2.json |   11 +-
 ...al_upgrade_by_invoice--Invoice.list.3.json |   11 +-
 ...al_upgrade_by_invoice--Invoice.list.4.json |   11 +-
 ...al_upgrade_by_invoice--Invoice.list.5.json |   20 +-
 ...rade_by_invoice--InvoiceItem.create.1.json |    2 +-
 ...rade_by_invoice--InvoiceItem.create.2.json |    2 +-
 ...mote_realm_upgrade--Customer.create.1.json |    4 +-
 ...mote_realm_upgrade--Customer.modify.1.json |    6 +-
 ...te_realm_upgrade--Customer.retrieve.1.json |    9 +-
 ...te_realm_upgrade--Customer.retrieve.2.json |    9 +-
 ...te_realm_upgrade--Customer.retrieve.3.json |    9 +-
 ...te_realm_upgrade--Customer.retrieve.4.json |    9 +-
 ...al_remote_realm_upgrade--Event.list.1.json |   10 +-
 ...al_remote_realm_upgrade--Event.list.2.json |  440 +++--
 ...al_remote_realm_upgrade--Event.list.3.json |  292 ++-
 ...al_remote_realm_upgrade--Event.list.4.json |  235 +--
 ...emote_realm_upgrade--Invoice.create.1.json |   20 +-
 ...m_upgrade--Invoice.finalize_invoice.1.json |   26 +-
 ..._remote_realm_upgrade--Invoice.list.2.json |   24 +-
 ...l_remote_realm_upgrade--Invoice.pay.1.json |   24 +-
 ...e_realm_upgrade--InvoiceItem.create.1.json |    6 +-
 ...e_realm_upgrade--InvoiceItem.create.2.json |    6 +-
 ...e_realm_upgrade--SetupIntent.create.1.json |    8 +-
 ...ote_realm_upgrade--SetupIntent.list.1.json |    4 +-
 ...realm_upgrade--SetupIntent.retrieve.1.json |    8 +-
 ...lm_upgrade--checkout.Session.create.1.json |   18 +-
 ...ealm_upgrade--checkout.Session.list.1.json |   18 +-
 ...ote_server_upgrade--Customer.modify.1.json |    2 +-
 ...e_server_upgrade--Customer.retrieve.1.json |    5 +-
 ...e_server_upgrade--Customer.retrieve.2.json |    5 +-
 ...e_server_upgrade--Customer.retrieve.3.json |    5 +-
 ...e_server_upgrade--Customer.retrieve.4.json |    5 +-
 ...l_remote_server_upgrade--Event.list.1.json |    6 +-
 ...l_remote_server_upgrade--Event.list.2.json |  196 +-
 ...l_remote_server_upgrade--Event.list.3.json |  258 ++-
 ...l_remote_server_upgrade--Event.list.4.json |  235 +--
 ...l_remote_server_upgrade--Event.list.5.json |    6 -
 ...mote_server_upgrade--Invoice.create.1.json |    4 +-
 ...r_upgrade--Invoice.finalize_invoice.1.json |    8 +-
 ...remote_server_upgrade--Invoice.list.2.json |    6 +-
 ..._remote_server_upgrade--Invoice.pay.1.json |    6 +-
 ..._server_upgrade--SetupIntent.create.1.json |    8 +-
 ...te_server_upgrade--SetupIntent.list.1.json |    4 +-
 ...erver_upgrade--SetupIntent.retrieve.1.json |    8 +-
 ...er_upgrade--checkout.Session.create.1.json |   14 +-
 ...rver_upgrade--checkout.Session.list.1.json |   14 +-
 ...uncaught_exception--Customer.modify.1.json |    2 +-
 ...caught_exception--Customer.retrieve.1.json |    5 +-
 ...caught_exception--Customer.retrieve.2.json |    5 +-
 ...caught_exception--Customer.retrieve.3.json |    5 +-
 ...with_uncaught_exception--Event.list.1.json |    6 +-
 ...with_uncaught_exception--Event.list.2.json |   87 +-
 ...with_uncaught_exception--Event.list.3.json |   41 +-
 ..._uncaught_exception--Invoice.create.1.json |    7 +-
 ...exception--Invoice.finalize_invoice.1.json |    9 +-
 ...ith_uncaught_exception--Invoice.pay.1.json |    9 +-
 ...aught_exception--InvoiceItem.create.1.json |    2 +-
 ...aught_exception--SetupIntent.create.1.json |    8 +-
 ...ncaught_exception--SetupIntent.list.1.json |    6 +-
 ...ght_exception--SetupIntent.retrieve.1.json |    8 +-
 ..._exception--checkout.Session.create.1.json |   14 +-
 ...ht_exception--checkout.Session.list.1.json |   14 +-
 .../invoice_plan--Customer.modify.1.json      |    2 +-
 .../invoice_plan--Customer.retrieve.1.json    |    5 +-
 .../invoice_plan--Customer.retrieve.2.json    |    5 +-
 .../invoice_plan--Customer.retrieve.3.json    |    5 +-
 .../invoice_plan--Customer.retrieve.4.json    |    5 +-
 .../invoice_plan--Event.list.1.json           |    6 +-
 .../invoice_plan--Event.list.2.json           |  189 +-
 .../invoice_plan--Event.list.3.json           |   29 +-
 .../invoice_plan--Invoice.create.1.json       |    3 +-
 .../invoice_plan--Invoice.create.2.json       |    5 +-
 ...oice_plan--Invoice.finalize_invoice.1.json |    7 +-
 ...oice_plan--Invoice.finalize_invoice.2.json |    9 +-
 .../invoice_plan--Invoice.list.2.json         |   12 +-
 .../invoice_plan--Invoice.pay.1.json          |    5 +-
 .../invoice_plan--SetupIntent.create.1.json   |    8 +-
 .../invoice_plan--SetupIntent.list.1.json     |    4 +-
 .../invoice_plan--SetupIntent.retrieve.1.json |    8 +-
 ...voice_plan--checkout.Session.create.1.json |   12 +-
 ...invoice_plan--checkout.Session.list.1.json |   12 +-
 ...ce_plans_as_needed--Customer.create.1.json |    4 +-
 ...ce_plans_as_needed--Customer.modify.1.json |    6 +-
 ..._plans_as_needed--Customer.retrieve.1.json |    9 +-
 ..._plans_as_needed--Customer.retrieve.2.json |    9 +-
 ..._plans_as_needed--Customer.retrieve.3.json |    9 +-
 ..._plans_as_needed--Customer.retrieve.4.json |    9 +-
 ...invoice_plans_as_needed--Event.list.1.json |   10 +-
 ...invoice_plans_as_needed--Event.list.2.json |   82 +-
 ...invoice_plans_as_needed--Event.list.3.json |  260 ++-
 ...invoice_plans_as_needed--Event.list.4.json |  235 +--
 ...invoice_plans_as_needed--Event.list.5.json |    6 -
 ...ice_plans_as_needed--Invoice.create.1.json |    4 +-
 ...ice_plans_as_needed--Invoice.create.2.json |    5 +-
 ...as_needed--Invoice.finalize_invoice.1.json |    8 +-
 ...as_needed--Invoice.finalize_invoice.2.json |    9 +-
 ...voice_plans_as_needed--Invoice.list.2.json |   15 +-
 ...nvoice_plans_as_needed--Invoice.pay.1.json |    8 +-
 ...plans_as_needed--SetupIntent.create.1.json |    8 +-
 ...e_plans_as_needed--SetupIntent.list.1.json |    4 +-
 ...ans_as_needed--SetupIntent.retrieve.1.json |    8 +-
 ..._as_needed--checkout.Session.create.1.json |   18 +-
 ...ns_as_needed--checkout.Session.list.1.json |   18 +-
 ...s_as_needed_server--Customer.modify.1.json |    2 +-
 ...as_needed_server--Customer.retrieve.1.json |    5 +-
 ...as_needed_server--Customer.retrieve.2.json |    5 +-
 ...as_needed_server--Customer.retrieve.3.json |    5 +-
 ...as_needed_server--Customer.retrieve.4.json |    5 +-
 ..._plans_as_needed_server--Event.list.1.json |    6 +-
 ..._plans_as_needed_server--Event.list.2.json |   78 +-
 ..._plans_as_needed_server--Event.list.3.json |  258 ++-
 ..._plans_as_needed_server--Event.list.4.json |  235 +--
 ..._plans_as_needed_server--Event.list.5.json |    6 -
 ...ns_as_needed_server--Invoice.create.1.json |    4 +-
 ...ns_as_needed_server--Invoice.create.2.json |    5 +-
 ...ed_server--Invoice.finalize_invoice.1.json |    8 +-
 ...ed_server--Invoice.finalize_invoice.2.json |    9 +-
 ...lans_as_needed_server--Invoice.list.2.json |   15 +-
 ...plans_as_needed_server--Invoice.pay.1.json |    6 +-
 ...s_needed_server--SetupIntent.create.1.json |    8 +-
 ..._as_needed_server--SetupIntent.list.1.json |    4 +-
 ...needed_server--SetupIntent.retrieve.1.json |    8 +-
 ...ded_server--checkout.Session.create.1.json |   14 +-
 ...eeded_server--checkout.Session.list.1.json |   14 +-
 ..._realm_legacy_plan--Customer.create.1.json |    4 +-
 ..._realm_legacy_plan--Customer.modify.1.json |    6 +-
 ...ealm_legacy_plan--Customer.retrieve.1.json |    9 +-
 ...ealm_legacy_plan--Customer.retrieve.2.json |    9 +-
 ...ealm_legacy_plan--Customer.retrieve.3.json |    9 +-
 ...ealm_legacy_plan--Customer.retrieve.4.json |    9 +-
 ...e_realm_legacy_plan--Invoice.create.1.json |    4 +-
 ...gacy_plan--Invoice.finalize_invoice.1.json |    8 +-
 ...ade_realm_legacy_plan--Invoice.list.2.json |    8 +-
 ...alm_legacy_plan--SetupIntent.create.1.json |    8 +-
 ...realm_legacy_plan--SetupIntent.list.1.json |    4 +-
 ...m_legacy_plan--SetupIntent.retrieve.1.json |    8 +-
 ...egacy_plan--checkout.Session.create.1.json |   18 +-
 ..._legacy_plan--checkout.Session.list.1.json |   18 +-
 ...server_legacy_plan--Customer.modify.1.json |    2 +-
 ...rver_legacy_plan--Customer.retrieve.1.json |    5 +-
 ...rver_legacy_plan--Customer.retrieve.2.json |    5 +-
 ...rver_legacy_plan--Customer.retrieve.3.json |    5 +-
 ...rver_legacy_plan--Customer.retrieve.4.json |    5 +-
 ..._server_legacy_plan--Invoice.create.1.json |    4 +-
 ...gacy_plan--Invoice.finalize_invoice.1.json |    8 +-
 ...de_server_legacy_plan--Invoice.list.2.json |    8 +-
 ...ver_legacy_plan--SetupIntent.create.1.json |    8 +-
 ...erver_legacy_plan--SetupIntent.list.1.json |    4 +-
 ...r_legacy_plan--SetupIntent.retrieve.1.json |    8 +-
 ...egacy_plan--checkout.Session.create.1.json |   14 +-
 ..._legacy_plan--checkout.Session.list.1.json |   14 +-
 ...realms_and_upgrade--Customer.create.1.json |    4 +-
 ...realms_and_upgrade--Customer.modify.1.json |    6 +-
 ...alms_and_upgrade--Customer.retrieve.1.json |    9 +-
 ...alms_and_upgrade--Customer.retrieve.2.json |    9 +-
 ...alms_and_upgrade--Customer.retrieve.3.json |    9 +-
 ...alms_and_upgrade--Customer.retrieve.4.json |    9 +-
 ...alms_and_upgrade--Customer.retrieve.5.json |    9 +-
 ...r_to_realms_and_upgrade--Event.list.1.json |   10 +-
 ...r_to_realms_and_upgrade--Event.list.2.json |  200 +-
 ...r_to_realms_and_upgrade--Event.list.3.json |  480 ++++-
 ...r_to_realms_and_upgrade--Event.list.4.json |  467 +----
 ...r_to_realms_and_upgrade--Event.list.5.json |    6 -
 ..._realms_and_upgrade--Invoice.create.1.json |    4 +-
 ...d_upgrade--Invoice.finalize_invoice.1.json |    8 +-
 ..._to_realms_and_upgrade--Invoice.pay.1.json |    8 +-
 ...lms_and_upgrade--SetupIntent.create.1.json |    8 +-
 ...ealms_and_upgrade--SetupIntent.list.1.json |    4 +-
 ...s_and_upgrade--SetupIntent.retrieve.1.json |    8 +-
 ...nd_upgrade--checkout.Session.create.1.json |   18 +-
 ..._and_upgrade--checkout.Session.list.1.json |   18 +-
 ...ponsorship_billing--Customer.modify.1.json |    2 +-
 ...nsorship_billing--Customer.retrieve.1.json |    5 +-
 ...nsorship_billing--Customer.retrieve.2.json |    5 +-
 ...nsorship_billing--Customer.retrieve.3.json |    5 +-
 ...nsorship_billing--Customer.retrieve.4.json |    5 +-
 ...nsorship_billing--Customer.retrieve.5.json |    5 +-
 ...non_sponsorship_billing--Event.list.1.json |    6 +-
 ...non_sponsorship_billing--Event.list.2.json |  196 +-
 ...non_sponsorship_billing--Event.list.3.json |  258 ++-
 ...non_sponsorship_billing--Event.list.4.json |  235 +--
 ...non_sponsorship_billing--Event.list.5.json |    6 -
 ...sponsorship_billing--Invoice.create.1.json |    4 +-
 ...p_billing--Invoice.finalize_invoice.1.json |    8 +-
 ...on_sponsorship_billing--Invoice.pay.1.json |    6 +-
 ...sorship_billing--SetupIntent.create.1.json |    8 +-
 ...onsorship_billing--SetupIntent.list.1.json |    4 +-
 ...rship_billing--SetupIntent.retrieve.1.json |    8 +-
 ...ip_billing--checkout.Session.create.1.json |   14 +-
 ...ship_billing--checkout.Session.list.1.json |   14 +-
 ...ace_payment_method--Customer.modify.1.json |    2 +-
 ...ace_payment_method--Customer.modify.2.json |    2 +-
 ...ace_payment_method--Customer.modify.3.json |    2 +-
 ...e_payment_method--Customer.retrieve.1.json |    5 +-
 ...e_payment_method--Customer.retrieve.2.json |    5 +-
 ...e_payment_method--Customer.retrieve.3.json |    5 +-
 ...e_payment_method--Customer.retrieve.4.json |    5 +-
 ...e_payment_method--Customer.retrieve.5.json |    5 +-
 ...e_payment_method--Customer.retrieve.7.json |    5 +-
 .../replace_payment_method--Event.list.1.json |    6 +-
 .../replace_payment_method--Event.list.2.json |  189 +-
 .../replace_payment_method--Event.list.3.json |  204 +-
 .../replace_payment_method--Event.list.4.json |  186 +-
 .../replace_payment_method--Event.list.5.json |    6 -
 ...lace_payment_method--Invoice.create.1.json |    3 +-
 ...lace_payment_method--Invoice.create.2.json |    3 +-
 ...nt_method--Invoice.finalize_invoice.1.json |    7 +-
 ...nt_method--Invoice.finalize_invoice.2.json |    7 +-
 ...eplace_payment_method--Invoice.list.2.json |    5 +-
 ...eplace_payment_method--Invoice.list.3.json |    5 +-
 ...eplace_payment_method--Invoice.list.4.json |   10 +-
 ...replace_payment_method--Invoice.pay.1.json |    5 +-
 ...replace_payment_method--Invoice.pay.2.json |   43 +-
 ...replace_payment_method--Invoice.pay.3.json |    5 +-
 ...ayment_method--PaymentMethod.detach.1.json |    5 +-
 ...ayment_method--PaymentMethod.detach.2.json |    5 +-
 ..._payment_method--PaymentMethod.list.1.json |   10 +-
 ..._payment_method--PaymentMethod.list.2.json |    5 +-
 ..._payment_method--SetupIntent.create.1.json |    8 +-
 ..._payment_method--SetupIntent.create.2.json |   43 +-
 ..._payment_method--SetupIntent.create.3.json |    8 +-
 ..._payment_method--SetupIntent.create.4.json |    8 +-
 ...ce_payment_method--SetupIntent.list.1.json |    4 +-
 ...ce_payment_method--SetupIntent.list.2.json |    4 +-
 ...ce_payment_method--SetupIntent.list.3.json |    4 +-
 ...ce_payment_method--SetupIntent.list.4.json |    4 +-
 ...ayment_method--SetupIntent.retrieve.1.json |    8 +-
 ...ayment_method--SetupIntent.retrieve.2.json |    8 +-
 ...ayment_method--SetupIntent.retrieve.3.json |    8 +-
 ...ent_method--checkout.Session.create.1.json |   12 +-
 ...ent_method--checkout.Session.create.2.json |   12 +-
 ...ent_method--checkout.Session.create.3.json |   12 +-
 ...ent_method--checkout.Session.create.4.json |   12 +-
 ...ent_method--checkout.Session.create.5.json |   12 +-
 ...yment_method--checkout.Session.list.1.json |   12 +-
 ...yment_method--checkout.Session.list.2.json |   12 +-
 ...yment_method--checkout.Session.list.3.json |   12 +-
 ...r_fixed_price_plan--Customer.create.1.json |   10 +-
 ...r_fixed_price_plan--Customer.modify.1.json |   12 +-
 ...fixed_price_plan--Customer.retrieve.1.json |   20 +-
 ...fixed_price_plan--Customer.retrieve.2.json |   20 +-
 ...fixed_price_plan--Customer.retrieve.3.json |   20 +-
 ...fixed_price_plan--Customer.retrieve.4.json |   20 +-
 ...nother_fixed_price_plan--Event.list.1.json |   20 +-
 ...nother_fixed_price_plan--Event.list.2.json |  282 +--
 ...nother_fixed_price_plan--Event.list.3.json |  162 +-
 ...er_fixed_price_plan--Invoice.create.1.json |   30 +-
 ...r_fixed_price_plan--Invoice.create.10.json |   28 +-
 ...r_fixed_price_plan--Invoice.create.11.json |   28 +-
 ...r_fixed_price_plan--Invoice.create.12.json |   28 +-
 ...r_fixed_price_plan--Invoice.create.13.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.2.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.3.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.4.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.5.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.6.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.7.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.8.json |   28 +-
 ...er_fixed_price_plan--Invoice.create.9.json |   28 +-
 ...rice_plan--Invoice.finalize_invoice.1.json |   42 +-
 ...ice_plan--Invoice.finalize_invoice.10.json |   40 +-
 ...ice_plan--Invoice.finalize_invoice.11.json |   40 +-
 ...ice_plan--Invoice.finalize_invoice.12.json |   40 +-
 ...ice_plan--Invoice.finalize_invoice.13.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.2.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.3.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.4.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.5.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.6.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.7.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.8.json |   40 +-
 ...rice_plan--Invoice.finalize_invoice.9.json |   40 +-
 ...other_fixed_price_plan--Invoice.pay.1.json |   46 +-
 ...ixed_price_plan--InvoiceItem.create.1.json |   16 +-
 ...xed_price_plan--InvoiceItem.create.10.json |   12 +-
 ...xed_price_plan--InvoiceItem.create.11.json |   12 +-
 ...xed_price_plan--InvoiceItem.create.12.json |   12 +-
 ...xed_price_plan--InvoiceItem.create.13.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.2.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.3.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.4.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.5.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.6.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.7.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.8.json |   12 +-
 ...ixed_price_plan--InvoiceItem.create.9.json |   12 +-
 ...ixed_price_plan--SetupIntent.create.1.json |   12 +-
 ..._fixed_price_plan--SetupIntent.list.1.json |    8 +-
 ...ed_price_plan--SetupIntent.retrieve.1.json |   12 +-
 ...price_plan--checkout.Session.create.1.json |   24 +-
 ...d_price_plan--checkout.Session.list.1.json |   24 +-
 ...o_fixed_price_plan--Customer.create.1.json |    4 +-
 ...o_fixed_price_plan--Customer.modify.1.json |    6 +-
 ...fixed_price_plan--Customer.retrieve.1.json |    9 +-
 ...fixed_price_plan--Customer.retrieve.2.json |    9 +-
 ...fixed_price_plan--Customer.retrieve.3.json |    9 +-
 ...fixed_price_plan--Customer.retrieve.4.json |    9 +-
 ...to_fixed_price_plan--Invoice.create.1.json |    3 +-
 ...rice_plan--Invoice.finalize_invoice.1.json |    5 +-
 ...ixed_price_plan--SetupIntent.create.1.json |    8 +-
 ..._fixed_price_plan--SetupIntent.list.1.json |    4 +-
 ...ed_price_plan--SetupIntent.retrieve.1.json |    8 +-
 ...price_plan--checkout.Session.create.1.json |   16 +-
 ...d_price_plan--checkout.Session.list.1.json |   16 +-
 ...o_fixed_price_plan--Customer.modify.1.json |    2 +-
 ...fixed_price_plan--Customer.retrieve.1.json |    5 +-
 ...fixed_price_plan--Customer.retrieve.2.json |    5 +-
 ...fixed_price_plan--Customer.retrieve.3.json |    5 +-
 ...fixed_price_plan--Customer.retrieve.4.json |    5 +-
 ...to_fixed_price_plan--Invoice.create.1.json |    3 +-
 ...rice_plan--Invoice.finalize_invoice.1.json |    7 +-
 ...ixed_price_plan--SetupIntent.create.1.json |    8 +-
 ..._fixed_price_plan--SetupIntent.list.1.json |    4 +-
 ...ed_price_plan--SetupIntent.retrieve.1.json |    8 +-
 ...price_plan--checkout.Session.create.1.json |   14 +-
 ...d_price_plan--checkout.Session.list.1.json |   14 +-
 ...rice_business_plan--Customer.modify.1.json |    2 +-
 ...ce_business_plan--Customer.retrieve.1.json |    5 +-
 ...ce_business_plan--Customer.retrieve.2.json |    5 +-
 ...ce_business_plan--Customer.retrieve.3.json |    5 +-
 ...ce_business_plan--Customer.retrieve.4.json |    5 +-
 ...ce_business_plan--Customer.retrieve.5.json |    5 +-
 ...xed_price_business_plan--Event.list.1.json |    6 +-
 ...xed_price_business_plan--Event.list.2.json |  196 +-
 ...xed_price_business_plan--Event.list.3.json |  260 ++-
 ...xed_price_business_plan--Event.list.4.json |  235 +--
 ...xed_price_business_plan--Event.list.5.json |    6 -
 ...price_business_plan--Invoice.create.1.json |    4 +-
 ...price_business_plan--Invoice.create.2.json |    3 +-
 ...ness_plan--Invoice.finalize_invoice.1.json |    8 +-
 ...ness_plan--Invoice.finalize_invoice.2.json |    7 +-
 ...ed_price_business_plan--Invoice.pay.1.json |    6 +-
 ...e_business_plan--SetupIntent.create.1.json |    8 +-
 ...ice_business_plan--SetupIntent.list.1.json |    4 +-
 ...business_plan--SetupIntent.retrieve.1.json |    8 +-
 ...iness_plan--checkout.Session.create.1.json |   14 +-
 ...usiness_plan--checkout.Session.list.1.json |   14 +-
 ...nual_business_plan--Customer.create.1.json |    4 +-
 ...nual_business_plan--Customer.modify.1.json |    6 +-
 ...al_business_plan--Customer.retrieve.1.json |    9 +-
 ...al_business_plan--Customer.retrieve.2.json |    9 +-
 ...al_business_plan--Customer.retrieve.3.json |    9 +-
 ...al_business_plan--Customer.retrieve.4.json |    9 +-
 ...al_business_plan--Customer.retrieve.5.json |    9 +-
 ...ce_annual_business_plan--Event.list.1.json |   10 +-
 ...ce_annual_business_plan--Event.list.2.json |   72 +-
 ...ce_annual_business_plan--Event.list.3.json |  258 ++-
 ...ce_annual_business_plan--Event.list.4.json |  235 +--
 ...ce_annual_business_plan--Event.list.5.json |    6 -
 ...nnual_business_plan--Invoice.create.1.json |    4 +-
 ...nnual_business_plan--Invoice.create.2.json |    3 +-
 ...ness_plan--Invoice.finalize_invoice.1.json |    8 +-
 ...ness_plan--Invoice.finalize_invoice.2.json |    7 +-
 ...e_annual_business_plan--Invoice.pay.1.json |    6 +-
 ...l_business_plan--SetupIntent.create.1.json |    8 +-
 ...ual_business_plan--SetupIntent.list.1.json |    4 +-
 ...business_plan--SetupIntent.retrieve.1.json |    8 +-
 ...iness_plan--checkout.Session.create.1.json |   16 +-
 ...usiness_plan--checkout.Session.list.1.json |   16 +-
 ...ealms_on_paid_plan--Customer.modify.1.json |    2 +-
 ...lms_on_paid_plan--Customer.retrieve.1.json |    5 +-
 ...lms_on_paid_plan--Customer.retrieve.2.json |    5 +-
 ...lms_on_paid_plan--Customer.retrieve.3.json |    5 +-
 ...lms_on_paid_plan--Customer.retrieve.4.json |    5 +-
 ...for_realms_on_paid_plan--Event.list.1.json |  193 +-
 ...for_realms_on_paid_plan--Event.list.2.json |  447 ++++-
 ...for_realms_on_paid_plan--Event.list.3.json |  240 ++-
 ...for_realms_on_paid_plan--Event.list.4.json |  186 +-
 ...for_realms_on_paid_plan--Event.list.5.json |    6 -
 ...realms_on_paid_plan--Invoice.create.1.json |   15 +-
 ...paid_plan--Invoice.finalize_invoice.1.json |   23 +-
 ...or_realms_on_paid_plan--Invoice.pay.1.json |   21 +-
 ...ms_on_paid_plan--InvoiceItem.create.1.json |    6 +-
 ...ms_on_paid_plan--SetupIntent.create.1.json |    8 +-
 ...alms_on_paid_plan--SetupIntent.list.1.json |    4 +-
 ..._on_paid_plan--SetupIntent.retrieve.1.json |    8 +-
 ..._paid_plan--checkout.Session.create.1.json |   12 +-
 ...on_paid_plan--checkout.Session.list.1.json |   12 +-
 ...illing_portal_urls--Customer.modify.1.json |    2 +-
 ...ling_portal_urls--Customer.retrieve.1.json |    5 +-
 ...ling_portal_urls--Customer.retrieve.2.json |    5 +-
 ...ling_portal_urls--Customer.retrieve.3.json |    5 +-
 ...ipe_billing_portal_urls--Event.list.1.json |   12 +-
 ...ipe_billing_portal_urls--Event.list.2.json |  608 +++---
 ...ipe_billing_portal_urls--Event.list.3.json |  774 +++-----
 ...billing_portal_urls--Invoice.create.1.json |   30 +-
 ...rtal_urls--Invoice.finalize_invoice.1.json |   34 +-
 ...pe_billing_portal_urls--Invoice.pay.1.json |   42 +-
 ...ing_portal_urls--InvoiceItem.create.1.json |    4 +-
 ...ing_portal_urls--SetupIntent.create.1.json |    8 +-
 ...lling_portal_urls--SetupIntent.list.1.json |    4 +-
 ...g_portal_urls--SetupIntent.retrieve.1.json |    8 +-
 ...billing_portal.Configuration.create.1.json |    2 +-
 ...billing_portal.Configuration.create.2.json |    2 +-
 ...billing_portal.Configuration.create.3.json |    2 +-
 ...urls--billing_portal.Session.create.1.json |    8 +-
 ...urls--billing_portal.Session.create.2.json |    6 +-
 ...urls--billing_portal.Session.create.3.json |    6 +-
 ...ortal_urls--checkout.Session.create.1.json |   12 +-
 ..._portal_urls--checkout.Session.list.1.json |   12 +-
 ...s_for_remote_realm--Customer.create.1.json |    4 +-
 ...s_for_remote_realm--Customer.modify.1.json |    6 +-
 ...for_remote_realm--Customer.retrieve.1.json |    9 +-
 ...for_remote_realm--Customer.retrieve.2.json |    9 +-
 ...for_remote_realm--Customer.retrieve.3.json |    9 +-
 ...for_remote_realm--Customer.retrieve.4.json |    9 +-
 ...l_urls_for_remote_realm--Event.list.1.json |   10 +-
 ...l_urls_for_remote_realm--Event.list.2.json |  318 +--
 ...l_urls_for_remote_realm--Event.list.3.json |  262 ++-
 ...ls_for_remote_realm--Invoice.create.1.json |    2 +-
 ...ote_realm--Invoice.finalize_invoice.1.json |    4 +-
 ..._urls_for_remote_realm--Invoice.pay.1.json |    4 +-
 ...or_remote_realm--SetupIntent.create.1.json |    8 +-
 ..._for_remote_realm--SetupIntent.list.1.json |    4 +-
 ..._remote_realm--SetupIntent.retrieve.1.json |    8 +-
 ...billing_portal.Configuration.create.1.json |    2 +-
 ...billing_portal.Configuration.create.2.json |    2 +-
 ...ealm--billing_portal.Session.create.1.json |    8 +-
 ...ealm--billing_portal.Session.create.2.json |    8 +-
 ...mote_realm--checkout.Session.create.1.json |   18 +-
 ...remote_realm--checkout.Session.list.1.json |   18 +-
 ..._for_remote_server--Customer.modify.1.json |    2 +-
 ...or_remote_server--Customer.retrieve.1.json |    5 +-
 ...or_remote_server--Customer.retrieve.2.json |    5 +-
 ...or_remote_server--Customer.retrieve.3.json |    5 +-
 ...or_remote_server--Customer.retrieve.4.json |    5 +-
 ..._urls_for_remote_server--Event.list.1.json |    6 +-
 ..._urls_for_remote_server--Event.list.2.json |   72 +-
 ..._urls_for_remote_server--Event.list.3.json |   24 +-
 ...s_for_remote_server--Invoice.create.1.json |    2 +-
 ...te_server--Invoice.finalize_invoice.1.json |    6 +-
 ...urls_for_remote_server--Invoice.pay.1.json |    4 +-
 ...r_remote_server--SetupIntent.create.1.json |    8 +-
 ...for_remote_server--SetupIntent.list.1.json |    4 +-
 ...remote_server--SetupIntent.retrieve.1.json |    8 +-
 ...billing_portal.Configuration.create.1.json |    2 +-
 ...billing_portal.Configuration.create.2.json |    2 +-
 ...rver--billing_portal.Session.create.1.json |    6 +-
 ...rver--billing_portal.Session.create.2.json |    6 +-
 ...ote_server--checkout.Session.create.1.json |   14 +-
 ...emote_server--checkout.Session.list.1.json |   14 +-
 ...license_management--Customer.modify.1.json |    2 +-
 ...cense_management--Customer.retrieve.1.json |    5 +-
 ...cense_management--Customer.retrieve.2.json |    5 +-
 ...cense_management--Customer.retrieve.3.json |    5 +-
 ...cense_management--Customer.retrieve.4.json |    5 +-
 ...cense_management--Customer.retrieve.5.json |    5 +-
 ...cense_management--Customer.retrieve.6.json |    5 +-
 ...atic_license_management--Event.list.1.json |    6 +-
 ...atic_license_management--Event.list.2.json |  185 +-
 ...atic_license_management--Event.list.3.json |  204 +-
 ...atic_license_management--Event.list.4.json |  186 +-
 ...atic_license_management--Event.list.5.json |    6 -
 ..._license_management--Invoice.create.1.json |    3 +-
 ..._license_management--Invoice.create.2.json |    4 +-
 ..._license_management--Invoice.create.3.json |    3 +-
 ...anagement--Invoice.finalize_invoice.1.json |    5 +-
 ...anagement--Invoice.finalize_invoice.2.json |    8 +-
 ...anagement--Invoice.finalize_invoice.3.json |    7 +-
 ...ic_license_management--Invoice.list.2.json |   13 +-
 ...ic_license_management--Invoice.list.3.json |   18 +-
 ...tic_license_management--Invoice.pay.1.json |    5 +-
 ...ense_management--SetupIntent.create.1.json |    8 +-
 ...icense_management--SetupIntent.list.1.json |    4 +-
 ...se_management--SetupIntent.retrieve.1.json |    8 +-
 ...management--checkout.Session.create.1.json |   12 +-
 ...e_management--checkout.Session.list.1.json |   12 +-
 ...license_management--Customer.modify.1.json |    2 +-
 ...cense_management--Customer.retrieve.1.json |    5 +-
 ...cense_management--Customer.retrieve.2.json |    5 +-
 ...cense_management--Customer.retrieve.3.json |    5 +-
 ...cense_management--Customer.retrieve.4.json |    5 +-
 ...cense_management--Customer.retrieve.5.json |    5 +-
 ...atic_license_management--Event.list.1.json |    6 +-
 ...atic_license_management--Event.list.2.json |   73 +-
 ...atic_license_management--Event.list.3.json |   29 +-
 ..._license_management--Invoice.create.1.json |    3 +-
 ..._license_management--Invoice.create.2.json |    3 +-
 ..._license_management--Invoice.create.3.json |    4 +-
 ..._license_management--Invoice.create.4.json |    3 +-
 ..._license_management--Invoice.create.5.json |    3 +-
 ...anagement--Invoice.finalize_invoice.1.json |    7 +-
 ...anagement--Invoice.finalize_invoice.2.json |    7 +-
 ...anagement--Invoice.finalize_invoice.3.json |    8 +-
 ...anagement--Invoice.finalize_invoice.4.json |    7 +-
 ...anagement--Invoice.finalize_invoice.5.json |    5 +-
 ...ic_license_management--Invoice.list.2.json |   18 +-
 ...ic_license_management--Invoice.list.3.json |   23 +-
 ...ic_license_management--Invoice.list.4.json |   26 +-
 ...tic_license_management--Invoice.pay.1.json |    5 +-
 ...ense_management--SetupIntent.create.1.json |    8 +-
 ...icense_management--SetupIntent.list.1.json |    4 +-
 ...se_management--SetupIntent.retrieve.1.json |    8 +-
 ...management--checkout.Session.create.1.json |   12 +-
 ...e_management--checkout.Session.list.1.json |   12 +-
 ...license_management--Customer.modify.1.json |    2 +-
 ...cense_management--Customer.retrieve.1.json |    5 +-
 ...cense_management--Customer.retrieve.2.json |    5 +-
 ...cense_management--Customer.retrieve.3.json |    5 +-
 ...cense_management--Customer.retrieve.4.json |    5 +-
 ...cense_management--Customer.retrieve.5.json |    5 +-
 ...nual_license_management--Event.list.1.json |    6 +-
 ...nual_license_management--Event.list.2.json |  185 +-
 ...nual_license_management--Event.list.3.json |  204 +-
 ...nual_license_management--Event.list.4.json |  186 +-
 ...nual_license_management--Event.list.5.json |    6 -
 ..._license_management--Invoice.create.1.json |    3 +-
 ..._license_management--Invoice.create.2.json |    3 +-
 ..._license_management--Invoice.create.3.json |    3 +-
 ...anagement--Invoice.finalize_invoice.1.json |    5 +-
 ...anagement--Invoice.finalize_invoice.2.json |    7 +-
 ...anagement--Invoice.finalize_invoice.3.json |    7 +-
 ...al_license_management--Invoice.list.2.json |   12 +-
 ...al_license_management--Invoice.list.3.json |   17 +-
 ...ual_license_management--Invoice.pay.1.json |    5 +-
 ...ense_management--SetupIntent.create.1.json |    8 +-
 ...icense_management--SetupIntent.list.1.json |    4 +-
 ...se_management--SetupIntent.retrieve.1.json |    8 +-
 ...management--checkout.Session.create.1.json |   12 +-
 ...e_management--checkout.Session.list.1.json |   12 +-
 ..._annual_to_monthly--Customer.modify.1.json |    2 +-
 ...nnual_to_monthly--Customer.retrieve.1.json |    5 +-
 ...nnual_to_monthly--Customer.retrieve.2.json |    5 +-
 ...nnual_to_monthly--Customer.retrieve.3.json |    5 +-
 ...nnual_to_monthly--Customer.retrieve.4.json |    5 +-
 ..._from_annual_to_monthly--Event.list.1.json |    6 +-
 ...nual_to_monthly--SetupIntent.create.1.json |    8 +-
 ...annual_to_monthly--SetupIntent.list.1.json |    4 +-
 ...al_to_monthly--SetupIntent.retrieve.1.json |    8 +-
 ...to_monthly--checkout.Session.create.1.json |   12 +-
 ...l_to_monthly--checkout.Session.list.1.json |   12 +-
 ..._monthly_to_annual--Customer.modify.1.json |    2 +-
 ...onthly_to_annual--Customer.retrieve.1.json |    5 +-
 ...onthly_to_annual--Customer.retrieve.2.json |    5 +-
 ...onthly_to_annual--Customer.retrieve.3.json |    5 +-
 ...onthly_to_annual--Customer.retrieve.4.json |    5 +-
 ..._from_monthly_to_annual--Event.list.1.json |    6 +-
 ...nthly_to_annual--SetupIntent.create.1.json |    8 +-
 ...monthly_to_annual--SetupIntent.list.1.json |    4 +-
 ...hly_to_annual--SetupIntent.retrieve.1.json |    8 +-
 ..._to_annual--checkout.Session.create.1.json |   12 +-
 ...ly_to_annual--checkout.Session.list.1.json |   12 +-
 ...Customer.create_balance_transaction.1.json |    4 +-
 ...ndard_to_plus_plan--Customer.modify.1.json |    2 +-
 ...ard_to_plus_plan--Customer.retrieve.1.json |    5 +-
 ...ard_to_plus_plan--Customer.retrieve.2.json |    5 +-
 ...ard_to_plus_plan--Customer.retrieve.3.json |    5 +-
 ...ard_to_plus_plan--Customer.retrieve.4.json |    5 +-
 ...m_standard_to_plus_plan--Event.list.1.json |    6 +-
 ...m_standard_to_plus_plan--Event.list.2.json |  189 +-
 ...m_standard_to_plus_plan--Event.list.3.json |  210 +-
 ...m_standard_to_plus_plan--Event.list.4.json |  186 +-
 ...m_standard_to_plus_plan--Event.list.5.json |    6 -
 ...andard_to_plus_plan--Invoice.create.1.json |    3 +-
 ...andard_to_plus_plan--Invoice.create.2.json |    9 +-
 ...plus_plan--Invoice.finalize_invoice.1.json |    7 +-
 ...plus_plan--Invoice.finalize_invoice.2.json |   13 +-
 ..._standard_to_plus_plan--Invoice.pay.1.json |    7 +-
 ...rd_to_plus_plan--SetupIntent.create.1.json |    8 +-
 ...dard_to_plus_plan--SetupIntent.list.1.json |    4 +-
 ..._to_plus_plan--SetupIntent.retrieve.1.json |    8 +-
 ..._plus_plan--checkout.Session.create.1.json |   12 +-
 ...to_plus_plan--checkout.Session.list.1.json |   12 +-
 ...rom_billing_page--Customer.retrieve.1.json |    8 +-
 ...rom_billing_page--Customer.retrieve.2.json |    2 +-
 ...rom_billing_page--Customer.retrieve.3.json |   33 +
 ..._plan_from_billing_page--Event.list.1.json |    6 +-
 ...plan_from_billing_page--Event.list.2.json} | 1551 ++++++---------
 ..._plan_from_billing_page--Event.list.3.json |  301 +++
 ..._plan_from_billing_page--Event.list.4.json |  101 +
 ...plan_from_billing_page--Event.list.5.json} |    0
 ...n_from_billing_page--Invoice.create.1.json |    4 +-
 ...n_from_billing_page--Invoice.create.2.json |    4 +-
 ...n_from_billing_page--Invoice.create.3.json |    3 +-
 ...ling_page--Invoice.finalize_invoice.1.json |   10 +-
 ...ling_page--Invoice.finalize_invoice.2.json |   10 +-
 ...ling_page--Invoice.finalize_invoice.3.json |    9 +-
 ...lan_from_billing_page--Invoice.list.1.json |   30 +-
 ...lan_from_billing_page--Invoice.list.2.json |   37 +-
 ...plan_from_billing_page--Invoice.pay.1.json |  169 ++
 .../upgrade_by_card--Charge.list.1.json       |    6 +-
 .../upgrade_by_card--Customer.modify.1.json   |    2 +-
 .../upgrade_by_card--Customer.retrieve.2.json |    5 +-
 .../upgrade_by_card--Customer.retrieve.3.json |    5 +-
 .../upgrade_by_card--Customer.retrieve.4.json |    5 +-
 .../upgrade_by_card--Customer.retrieve.5.json |    5 +-
 .../upgrade_by_card--Customer.retrieve.6.json |    5 +-
 .../upgrade_by_card--Event.list.1.json        |   11 +-
 .../upgrade_by_card--Event.list.2.json        |    6 +-
 .../upgrade_by_card--Event.list.3.json        |  207 +-
 .../upgrade_by_card--Event.list.4.json        |  208 +-
 .../upgrade_by_card--Event.list.5.json        |  186 +-
 .../upgrade_by_card--Event.list.6.json        |    6 -
 .../upgrade_by_card--Invoice.create.1.json    |    5 +-
 ...e_by_card--Invoice.finalize_invoice.1.json |    9 +-
 .../upgrade_by_card--Invoice.list.2.json      |    7 +-
 .../upgrade_by_card--Invoice.pay.1.json       |    7 +-
 ...upgrade_by_card--SetupIntent.create.1.json |    8 +-
 .../upgrade_by_card--SetupIntent.list.1.json  |    6 +-
 ...grade_by_card--SetupIntent.retrieve.1.json |    8 +-
 ...de_by_card--checkout.Session.create.1.json |   14 +-
 ...rade_by_card--checkout.Session.list.1.json |   14 +-
 ...th_outdated_seat_count--Charge.list.1.json |    6 +-
 ...utdated_seat_count--Customer.modify.1.json |    2 +-
 ...dated_seat_count--Customer.retrieve.1.json |    5 +-
 ...dated_seat_count--Customer.retrieve.2.json |    5 +-
 ...ith_outdated_seat_count--Event.list.1.json |    6 +-
 ...ith_outdated_seat_count--Event.list.2.json |  552 ++----
 ...ith_outdated_seat_count--Event.list.3.json |  234 ++-
 ...ith_outdated_seat_count--Event.list.4.json |  449 +++--
 ...ith_outdated_seat_count--Event.list.5.json |  180 +-
 ...ith_outdated_seat_count--Event.list.6.json |    6 -
 ...outdated_seat_count--Invoice.create.1.json |   15 +-
 ...outdated_seat_count--Invoice.create.2.json |   19 +-
 ...eat_count--Invoice.finalize_invoice.1.json |   21 +-
 ...eat_count--Invoice.finalize_invoice.2.json |   25 +-
 ...h_outdated_seat_count--Invoice.list.2.json |   44 +-
 ...th_outdated_seat_count--Invoice.pay.1.json |   19 +-
 ...ated_seat_count--InvoiceItem.create.1.json |    8 +-
 ...ated_seat_count--InvoiceItem.create.2.json |    8 +-
 ...ated_seat_count--SetupIntent.create.1.json |    8 +-
 ...tdated_seat_count--SetupIntent.list.1.json |    6 +-
 ...ed_seat_count--SetupIntent.retrieve.1.json |    8 +-
 ...seat_count--checkout.Session.create.1.json |   14 +-
 ...d_seat_count--checkout.Session.list.1.json |   14 +-
 ...grade_by_invoice--Customer.retrieve.1.json |    6 +-
 ...grade_by_invoice--Customer.retrieve.3.json |   33 +
 .../upgrade_by_invoice--Event.list.1.json     |    9 +-
 .../upgrade_by_invoice--Event.list.2.json     | 1098 +++++++++++
 .../upgrade_by_invoice--Event.list.3.json     |  301 +++
 ... => upgrade_by_invoice--Event.list.4.json} |    0
 .../upgrade_by_invoice--Invoice.create.1.json |    8 +-
 ...y_invoice--Invoice.finalize_invoice.1.json |   14 +-
 .../upgrade_by_invoice--Invoice.list.1.json   |   24 +-
 .../upgrade_by_invoice--Invoice.pay.1.json    |  169 ++
 ...rade_by_invoice--InvoiceItem.create.1.json |    2 +-
 ...pgrade_legacy_plan--Customer.modify.1.json |    2 +-
 ...rade_legacy_plan--Customer.retrieve.1.json |    5 +-
 ...rade_legacy_plan--Customer.retrieve.2.json |    5 +-
 ...rade_legacy_plan--Customer.retrieve.3.json |    5 +-
 ...rade_legacy_plan--Customer.retrieve.4.json |    5 +-
 ...rade_legacy_plan--Customer.retrieve.5.json |    5 +-
 ...rade_legacy_plan--Customer.retrieve.6.json |    5 +-
 ...ade_legacy_plan--SetupIntent.create.1.json |    8 +-
 ...grade_legacy_plan--SetupIntent.list.1.json |    4 +-
 ...e_legacy_plan--SetupIntent.retrieve.1.json |    8 +-
 ...egacy_plan--checkout.Session.create.1.json |   14 +-
 ..._legacy_plan--checkout.Session.list.1.json |   14 +-
 ...ade_license_counts--Customer.modify.1.json |    2 +-
 ...e_license_counts--Customer.retrieve.1.json |    5 +-
 ..._license_counts--Customer.retrieve.10.json |    5 +-
 ..._license_counts--Customer.retrieve.11.json |    5 +-
 ..._license_counts--Customer.retrieve.12.json |    5 +-
 ..._license_counts--Customer.retrieve.13.json |    5 +-
 ..._license_counts--Customer.retrieve.14.json |    5 +-
 ..._license_counts--Customer.retrieve.15.json |    5 +-
 ..._license_counts--Customer.retrieve.16.json |    5 +-
 ..._license_counts--Customer.retrieve.17.json |    5 +-
 ..._license_counts--Customer.retrieve.18.json |    5 +-
 ..._license_counts--Customer.retrieve.19.json |    5 +-
 ...e_license_counts--Customer.retrieve.2.json |    5 +-
 ..._license_counts--Customer.retrieve.20.json |    5 +-
 ..._license_counts--Customer.retrieve.21.json |    5 +-
 ..._license_counts--Customer.retrieve.22.json |    5 +-
 ..._license_counts--Customer.retrieve.23.json |    5 +-
 ..._license_counts--Customer.retrieve.24.json |    5 +-
 ..._license_counts--Customer.retrieve.25.json |    5 +-
 ..._license_counts--Customer.retrieve.26.json |    5 +-
 ..._license_counts--Customer.retrieve.27.json |    5 +-
 ..._license_counts--Customer.retrieve.28.json |    5 +-
 ...e_license_counts--Customer.retrieve.3.json |    5 +-
 ...e_license_counts--Customer.retrieve.4.json |    5 +-
 ...e_license_counts--Customer.retrieve.5.json |    5 +-
 ...e_license_counts--Customer.retrieve.6.json |    5 +-
 ...e_license_counts--Customer.retrieve.7.json |    5 +-
 ...e_license_counts--Customer.retrieve.8.json |    5 +-
 ...e_license_counts--Customer.retrieve.9.json |    5 +-
 ..._license_counts--SetupIntent.create.1.json |    8 +-
 ...de_license_counts--SetupIntent.list.1.json |    6 +-
 ...icense_counts--SetupIntent.retrieve.1.json |    8 +-
 ...nse_counts--checkout.Session.create.1.json |   14 +-
 ...cense_counts--checkout.Session.list.1.json |   14 +-
 ...ade_pay_by_invoice--Customer.create.1.json |   33 +
 ...e_pay_by_invoice--Customer.retrieve.1.json |   33 +
 ...e_pay_by_invoice--Customer.retrieve.2.json |   33 +
 ...ade_pay_by_invoice--Invoice.create.1.json} |   41 +-
 ...y_invoice--Invoice.finalize_invoice.1.json |  169 ++
 ...ade_pay_by_invoice--Invoice.refresh.1.json |  169 ++
 ...de_pay_by_invoice--Invoice.retrieve.1.json |  169 ++
 ...pay_by_invoice--InvoiceItem.create.1.json} |    6 +-
 ...uring_card_upgrade--Customer.modify.1.json |    2 +-
 ...ing_card_upgrade--Customer.retrieve.1.json |    5 +-
 ...ing_card_upgrade--Customer.retrieve.2.json |   11 +-
 ...ing_card_upgrade--Customer.retrieve.3.json |   11 +-
 ...ing_card_upgrade--Customer.retrieve.4.json |    5 +-
 ...ion_during_card_upgrade--Event.list.1.json |    6 +-
 ...ion_during_card_upgrade--Event.list.2.json | 1286 +++++++++++-
 ...ion_during_card_upgrade--Event.list.3.json |  756 +------
 ...ion_during_card_upgrade--Event.list.4.json |  564 +-----
 ...ion_during_card_upgrade--Event.list.5.json |    6 -
 ...ion_during_card_upgrade--Event.list.9.json |    6 -
 ...during_card_upgrade--Invoice.create.1.json |    1 +
 ...d_upgrade--Invoice.finalize_invoice.1.json |    7 +-
 ...n_during_card_upgrade--Invoice.list.2.json |    7 +-
 ...on_during_card_upgrade--Invoice.pay.1.json |    7 +-
 ...ng_card_upgrade--SetupIntent.create.1.json |    8 +-
 ...ring_card_upgrade--SetupIntent.list.1.json |    4 +-
 ..._card_upgrade--SetupIntent.retrieve.1.json |    8 +-
 ...rd_upgrade--checkout.Session.create.1.json |   12 +-
 ...card_upgrade--checkout.Session.list.1.json |   12 +-
 ...monthly_basic_plan--Customer.create.1.json |    4 +-
 ...monthly_basic_plan--Customer.modify.1.json |    6 +-
 ...nthly_basic_plan--Customer.retrieve.1.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.2.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.3.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.4.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.5.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.6.json |    9 +-
 ...r_to_monthly_basic_plan--Event.list.1.json |   10 +-
 ...r_to_monthly_basic_plan--Event.list.2.json |  200 +-
 ...r_to_monthly_basic_plan--Event.list.3.json |  260 ++-
 ...r_to_monthly_basic_plan--Event.list.4.json |  235 +--
 ...r_to_monthly_basic_plan--Event.list.5.json |    6 -
 ..._monthly_basic_plan--Invoice.create.1.json |    4 +-
 ...asic_plan--Invoice.finalize_invoice.1.json |    8 +-
 ..._to_monthly_basic_plan--Invoice.pay.1.json |    8 +-
 ...thly_basic_plan--SetupIntent.create.1.json |    8 +-
 ...onthly_basic_plan--SetupIntent.list.1.json |    4 +-
 ...ly_basic_plan--SetupIntent.retrieve.1.json |    8 +-
 ...basic_plan--checkout.Session.create.1.json |   18 +-
 ...y_basic_plan--checkout.Session.list.1.json |   18 +-
 ...monthly_basic_plan--Customer.modify.1.json |    2 +-
 ...nthly_basic_plan--Customer.retrieve.1.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.2.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.3.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.4.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.5.json |    5 +-
 ...rice_monthly_basic_plan--Event.list.1.json |    6 +-
 ...rice_monthly_basic_plan--Event.list.2.json |  189 +-
 ...rice_monthly_basic_plan--Event.list.3.json |  207 +-
 ...rice_monthly_basic_plan--Event.list.4.json |  185 +-
 ...rice_monthly_basic_plan--Event.list.5.json |    6 -
 ..._monthly_basic_plan--Invoice.create.1.json |    3 +-
 ...asic_plan--Invoice.finalize_invoice.1.json |    7 +-
 ...ice_monthly_basic_plan--Invoice.pay.1.json |    7 +-
 ...thly_basic_plan--SetupIntent.create.1.json |    8 +-
 ...onthly_basic_plan--SetupIntent.list.1.json |    4 +-
 ...ly_basic_plan--SetupIntent.retrieve.1.json |    8 +-
 ...basic_plan--checkout.Session.create.1.json |   14 +-
 ...y_basic_plan--checkout.Session.list.1.json |   14 +-
 ...monthly_basic_plan--Customer.modify.1.json |    2 +-
 ...nthly_basic_plan--Customer.retrieve.1.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.2.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.3.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.4.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.5.json |    5 +-
 ...nthly_basic_plan--Customer.retrieve.6.json |    5 +-
 ...r_to_monthly_basic_plan--Event.list.1.json |    6 +-
 ...r_to_monthly_basic_plan--Event.list.2.json |  196 +-
 ...r_to_monthly_basic_plan--Event.list.3.json |  482 ++++-
 ...r_to_monthly_basic_plan--Event.list.4.json |  467 +----
 ...r_to_monthly_basic_plan--Event.list.5.json |    6 -
 ..._monthly_basic_plan--Invoice.create.1.json |    4 +-
 ...asic_plan--Invoice.finalize_invoice.1.json |    8 +-
 ..._to_monthly_basic_plan--Invoice.pay.1.json |    8 +-
 ...thly_basic_plan--SetupIntent.create.1.json |    8 +-
 ...onthly_basic_plan--SetupIntent.list.1.json |    4 +-
 ...ly_basic_plan--SetupIntent.retrieve.1.json |    8 +-
 ...basic_plan--checkout.Session.create.1.json |   14 +-
 ...y_basic_plan--checkout.Session.list.1.json |   14 +-
 ...ic_plan_free_trial--Customer.create.1.json |    4 +-
 ...ic_plan_free_trial--Customer.modify.1.json |    6 +-
 ..._plan_free_trial--Customer.retrieve.1.json |    9 +-
 ..._plan_free_trial--Customer.retrieve.2.json |    9 +-
 ..._plan_free_trial--Customer.retrieve.3.json |    9 +-
 ..._plan_free_trial--Customer.retrieve.4.json |    9 +-
 ..._plan_free_trial--Customer.retrieve.5.json |    9 +-
 ..._plan_free_trial--Customer.retrieve.6.json |    9 +-
 ...o_basic_plan_free_trial--Event.list.1.json |   10 +-
 ...plan_free_trial--SetupIntent.create.1.json |    8 +-
 ...c_plan_free_trial--SetupIntent.list.1.json |    4 +-
 ...an_free_trial--SetupIntent.retrieve.1.json |    8 +-
 ...free_trial--checkout.Session.create.1.json |   18 +-
 ...n_free_trial--checkout.Session.list.1.json |   18 +-
 ...rial_remote_server--Customer.modify.1.json |    2 +-
 ...al_remote_server--Customer.retrieve.1.json |    5 +-
 ...al_remote_server--Customer.retrieve.2.json |    5 +-
 ...al_remote_server--Customer.retrieve.3.json |    5 +-
 ...al_remote_server--Customer.retrieve.4.json |    5 +-
 ...al_remote_server--Customer.retrieve.5.json |    5 +-
 ...al_remote_server--Customer.retrieve.6.json |    5 +-
 ...ree_trial_remote_server--Event.list.1.json |    6 +-
 ...l_remote_server--SetupIntent.create.1.json |    8 +-
 ...ial_remote_server--SetupIntent.list.1.json |    4 +-
 ...remote_server--SetupIntent.retrieve.1.json |    8 +-
 ...ote_server--checkout.Session.create.1.json |   14 +-
 ...emote_server--checkout.Session.list.1.json |   14 +-
 ...r_to_business_plan--Customer.create.1.json |    4 +-
 ...r_to_business_plan--Customer.modify.1.json |    6 +-
 ...to_business_plan--Customer.retrieve.1.json |    9 +-
 ...to_business_plan--Customer.retrieve.2.json |    9 +-
 ...to_business_plan--Customer.retrieve.3.json |    9 +-
 ...to_business_plan--Customer.retrieve.4.json |    9 +-
 ...to_business_plan--Customer.retrieve.5.json |    9 +-
 ...to_business_plan--Customer.retrieve.6.json |    9 +-
 ...e_user_to_business_plan--Event.list.1.json |   10 +-
 ...e_user_to_business_plan--Event.list.2.json |   82 +-
 ...e_user_to_business_plan--Event.list.3.json |   30 +-
 ...er_to_business_plan--Invoice.create.1.json |    4 +-
 ...ness_plan--Invoice.finalize_invoice.1.json |    8 +-
 ..._user_to_business_plan--Invoice.pay.1.json |    6 +-
 ...o_business_plan--SetupIntent.create.1.json |    8 +-
 ..._to_business_plan--SetupIntent.list.1.json |    4 +-
 ...business_plan--SetupIntent.retrieve.1.json |    8 +-
 ...iness_plan--checkout.Session.create.1.json |   18 +-
 ...usiness_plan--checkout.Session.list.1.json |   18 +-
 ...monthly_basic_plan--Customer.create.1.json |    4 +-
 ...monthly_basic_plan--Customer.modify.1.json |    6 +-
 ...nthly_basic_plan--Customer.retrieve.1.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.2.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.3.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.4.json |    9 +-
 ...nthly_basic_plan--Customer.retrieve.5.json |    9 +-
 ...rice_monthly_basic_plan--Event.list.1.json |   10 +-
 ...rice_monthly_basic_plan--Event.list.2.json |  384 +++-
 ...rice_monthly_basic_plan--Event.list.3.json |   36 +-
 ...rice_monthly_basic_plan--Event.list.4.json |  185 +-
 ...rice_monthly_basic_plan--Event.list.5.json |    6 -
 ..._monthly_basic_plan--Invoice.create.1.json |    3 +-
 ...asic_plan--Invoice.finalize_invoice.1.json |    5 +-
 ...ice_monthly_basic_plan--Invoice.pay.1.json |    5 +-
 ...thly_basic_plan--SetupIntent.create.1.json |    8 +-
 ...onthly_basic_plan--SetupIntent.list.1.json |    4 +-
 ...ly_basic_plan--SetupIntent.retrieve.1.json |    8 +-
 ...basic_plan--checkout.Session.create.1.json |   18 +-
 ...y_basic_plan--checkout.Session.list.1.json |   18 +-
 ...uncaught_exception--Customer.modify.1.json |    2 +-
 ...caught_exception--Customer.retrieve.1.json |    5 +-
 ...caught_exception--Customer.retrieve.2.json |    5 +-
 ...aught_exception--SetupIntent.create.1.json |   10 +-
 ...ncaught_exception--SetupIntent.list.1.json |    6 +-
 ...ght_exception--SetupIntent.retrieve.1.json |   10 +-
 ..._exception--checkout.Session.create.1.json |   14 +-
 ...ht_exception--checkout.Session.list.1.json |   14 +-
 ...d_all_open_invoices--Invoice.create.1.json |    3 +-
 ...d_all_open_invoices--Invoice.create.2.json |    3 +-
 ..._invoices--Invoice.finalize_invoice.1.json |    7 +-
 ..._invoices--Invoice.finalize_invoice.2.json |    7 +-
 ...oid_all_open_invoices--Invoice.list.1.json |    5 +-
 ...oid_all_open_invoices--Invoice.list.3.json |    5 +-
 ...oid_all_open_invoices--Invoice.list.4.json |    5 +-
 ...oid_all_open_invoices--Invoice.list.6.json |    5 +-
 ...open_invoices--Invoice.void_invoice.1.json |    5 +-
 ...open_invoices--Invoice.void_invoice.2.json |    5 +-
 corporate/tests/test_stripe.py                |   82 +-
 corporate/views/portico.py                    |    9 +-
 corporate/views/upgrade.py                    |   18 +
 templates/corporate/billing/upgrade.html      |  107 +-
 web/src/base_page_params.ts                   |    2 +
 web/src/billing/upgrade.ts                    |   27 +-
 web/styles/portico/billing.css                |   34 +-
 1173 files changed, 24701 insertions(+), 16933 deletions(-)
 create mode 100644 corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Customer.retrieve.1.json
 create mode 100644 corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.2.json
 create mode 100644 corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.3.json
 rename corporate/tests/stripe_fixtures/{add_minimum_licenses--Event.list.5.json => downgrade_realm_and_void_open_invoices--Event.list.4.json} (100%)
 create mode 100644 corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.2.json
 rename corporate/tests/stripe_fixtures/{upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.2.json => downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.2.json} (78%)
 create mode 100644 corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.pay.1.json
 create mode 100644 corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.2.json
 create mode 100644 corporate/tests/stripe_fixtures/fixed_price_plans--Customer.retrieve.1.json
 rename corporate/tests/stripe_fixtures/{upgrade_race_condition_during_card_upgrade--Event.list.7.json => fixed_price_plans--Event.list.2.json} (52%)
 rename corporate/tests/stripe_fixtures/{upgrade_race_condition_during_card_upgrade--Event.list.8.json => fixed_price_plans--Event.list.3.json} (52%)
 rename corporate/tests/stripe_fixtures/{free_trial_not_available_for_active_legacy_customer--Event.list.5.json => fixed_price_plans--Event.list.4.json} (100%)
 rename corporate/tests/stripe_fixtures/{upgrade_race_condition_during_card_upgrade--Invoice.pay.2.json => fixed_price_plans--Invoice.pay.1.json} (79%)
 delete mode 100644 corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/replace_payment_method--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.5.json
 create mode 100644 corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.3.json
 rename corporate/tests/stripe_fixtures/{upgrade_race_condition_during_card_upgrade--Event.list.6.json => update_licenses_of_manual_plan_from_billing_page--Event.list.2.json} (60%)
 create mode 100644 corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.3.json
 create mode 100644 corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.4.json
 rename corporate/tests/stripe_fixtures/{free_trial_not_available_for_ended_legacy_customer--Event.list.5.json => update_licenses_of_manual_plan_from_billing_page--Event.list.5.json} (100%)
 create mode 100644 corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.pay.1.json
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.6.json
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.6.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.3.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.2.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.3.json
 rename corporate/tests/stripe_fixtures/{invoice_initial_remote_realm_upgrade--Event.list.5.json => upgrade_by_invoice--Event.list.4.json} (100%)
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.pay.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.create.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.2.json
 rename corporate/tests/stripe_fixtures/{upgrade_race_condition_during_card_upgrade--Invoice.create.2.json => upgrade_pay_by_invoice--Invoice.create.1.json} (83%)
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.finalize_invoice.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.refresh.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.retrieve.1.json
 rename corporate/tests/stripe_fixtures/{upgrade_race_condition_during_card_upgrade--InvoiceItem.create.2.json => upgrade_pay_by_invoice--InvoiceItem.create.1.json} (93%)
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.9.json
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.5.json
 delete mode 100644 corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.5.json

diff --git a/corporate/lib/stripe.py b/corporate/lib/stripe.py
index 3d33537fd4..94e0e5c935 100644
--- a/corporate/lib/stripe.py
+++ b/corporate/lib/stripe.py
@@ -97,7 +97,7 @@ BILLING_SUPPORT_EMAIL = "sales@zulip.com"
 
 MIN_INVOICED_LICENSES = 30
 MAX_INVOICED_LICENSES = 1000
-DEFAULT_INVOICE_DAYS_UNTIL_DUE = 30
+DEFAULT_INVOICE_DAYS_UNTIL_DUE = 15
 
 VALID_BILLING_MODALITY_VALUES = ["send_invoice", "charge_automatically"]
 VALID_BILLING_SCHEDULE_VALUES = ["annual", "monthly"]
@@ -206,7 +206,9 @@ def validate_licenses(
 ) -> None:
     min_licenses = max(seat_count, min_licenses_for_plan)
     max_licenses = None
-    if not charge_automatically:
+    # max / min license check for invoiced plans is disabled in production right now.
+    # Logic and tests are kept in case we decide to enable it in future.
+    if settings.TEST_SUITE and not charge_automatically:
         min_licenses = max(seat_count, MIN_INVOICED_LICENSES)
         max_licenses = MAX_INVOICED_LICENSES
 
@@ -556,6 +558,7 @@ class UpgradeRequest:
 class InitialUpgradeRequest:
     manual_license_management: bool
     tier: int
+    billing_modality: str
     success_message: str = ""
 
 
@@ -639,6 +642,8 @@ class UpgradePageParams(TypedDict):
     flat_discount: int
     flat_discounted_months: int
     fixed_price: Optional[int]
+    setup_payment_by_invoice: bool
+    free_trial_days: Optional[int]
 
 
 class UpgradePageSessionTypeSpecificContext(TypedDict):
@@ -668,7 +673,6 @@ class UpgradePageContext(TypedDict):
     discount_percent: Optional[str]
     email: str
     exempt_from_license_number_check: bool
-    free_trial_days: Optional[int]
     free_trial_end_date: Optional[str]
     is_demo_organization: bool
     manual_license_management: bool
@@ -686,6 +690,7 @@ class UpgradePageContext(TypedDict):
     success_message: str
     is_sponsorship_pending: bool
     sponsorship_plan_name: str
+    scheduled_upgrade_invoice_amount_due: Optional[str]
 
 
 class SponsorshipRequestForm(forms.Form):
@@ -797,8 +802,14 @@ class BillingSession(ABC):
         return_to_billing_page: bool,
         manual_license_management: bool,
         tier: Optional[int] = None,
+        setup_payment_by_invoice: bool = False,
     ) -> str:
         customer = self.get_customer()
+        if setup_payment_by_invoice and (
+            customer is None or customer.stripe_customer_id is None
+        ):  # nocoverage
+            customer = self.create_stripe_customer()
+
         assert customer is not None and customer.stripe_customer_id is not None
 
         if return_to_billing_page:
@@ -809,6 +820,7 @@ class BillingSession(ABC):
             params = {
                 "manual_license_management": str(manual_license_management).lower(),
                 "tier": str(tier),
+                "setup_payment_by_invoice": str(setup_payment_by_invoice).lower(),
             }
             return_url = f"{base_return_url}?{urlencode(params)}"
 
@@ -878,7 +890,10 @@ class BillingSession(ABC):
             days_until_due = None
         else:
             collection_method = "send_invoice"
-            days_until_due = DEFAULT_INVOICE_DAYS_UNTIL_DUE
+            # days_until_due is required for `send_invoice` collection method. Since this is an invoice
+            # for upgrade, the due date is irrelevant since customer will upgrade once they pay the invoice
+            # regardless of the due date. Using `1` shows `Due today / tomorrow` which seems nice.
+            days_until_due = 1
 
         metadata = {
             "plan_tier": plan_tier,
@@ -1098,16 +1113,20 @@ class BillingSession(ABC):
         # NOTE: This charges users immediately.
         customer = self.get_customer()
         assert customer is not None and customer.stripe_customer_id is not None
+        charge_automatically = metadata["billing_modality"] == "charge_automatically"
         # Ensure customers have a default payment method set.
         stripe_customer = stripe_get_customer(customer.stripe_customer_id)
-        if not stripe_customer_has_credit_card_as_default_payment_method(stripe_customer):
+        if charge_automatically and not stripe_customer_has_credit_card_as_default_payment_method(
+            stripe_customer
+        ):
             raise BillingError(
                 "no payment method",
                 "Please add a credit card before upgrading.",
             )
 
-        assert stripe_customer.invoice_settings is not None
-        assert stripe_customer.invoice_settings.default_payment_method is not None
+        if charge_automatically:
+            assert stripe_customer.invoice_settings is not None
+            assert stripe_customer.invoice_settings.default_payment_method is not None
         stripe_invoice = None
         try:
             stripe_invoice = self.generate_invoice_for_upgrade(
@@ -1117,7 +1136,7 @@ class BillingSession(ABC):
                 metadata["licenses"],
                 metadata["plan_tier"],
                 metadata["billing_schedule"],
-                charge_automatically=True,
+                charge_automatically=charge_automatically,
                 license_management=metadata["license_management"],
             )
             assert stripe_invoice.id is not None
@@ -1126,10 +1145,11 @@ class BillingSession(ABC):
                 customer=customer,
                 status=Invoice.SENT,
             )
-            # Stripe takes its sweet hour to charge customers after creating an invoice.
-            # Since we want to charge customers immediately, we charge them manually.
-            # Then poll for the status of the invoice to see if the payment succeeded.
-            stripe_invoice = stripe.Invoice.pay(stripe_invoice.id)
+            if charge_automatically:
+                # Stripe takes its sweet hour to charge customers after creating an invoice.
+                # Since we want to charge customers immediately, we charge them manually.
+                # Then poll for the status of the invoice to see if the payment succeeded.
+                stripe_invoice = stripe.Invoice.pay(stripe_invoice.id)
         except Exception as e:
             if stripe_invoice is not None:
                 assert stripe_invoice.id is not None
@@ -1528,7 +1548,7 @@ class BillingSession(ABC):
             f"No current plan for {self.billing_entity_display_name}."
         )  # nocoverage
 
-    def generate_stripe_invoice_and_charge_immediately(
+    def generate_stripe_invoice(
         self,
         plan_tier: int,
         seat_count: int,
@@ -1813,7 +1833,6 @@ class BillingSession(ABC):
         if billing_modality == "charge_automatically" and license_management == "automatic":
             licenses = seat_count
         if billing_modality == "send_invoice":
-            schedule = "annual"
             license_management = "manual"
 
         exempt_from_license_number_check = (
@@ -1857,11 +1876,7 @@ class BillingSession(ABC):
             and upgrade_request.remote_server_plan_start_date == "billing_cycle_end_date"
         )
         # Directly upgrade free trial orgs or invoice payment orgs to standard plan.
-        if (
-            should_schedule_upgrade_for_legacy_remote_server
-            or free_trial
-            or not charge_automatically
-        ):
+        if should_schedule_upgrade_for_legacy_remote_server or free_trial:
             self.process_initial_upgrade(
                 upgrade_request.tier,
                 licenses,
@@ -1874,7 +1889,7 @@ class BillingSession(ABC):
             )
             data["organization_upgrade_successful"] = True
         else:
-            stripe_invoice_id = self.generate_stripe_invoice_and_charge_immediately(
+            stripe_invoice_id = self.generate_stripe_invoice(
                 upgrade_request.tier,
                 seat_count,
                 licenses,
@@ -2398,6 +2413,7 @@ class BillingSession(ABC):
 
         fixed_price = None
         pay_by_invoice_payments_page = None
+        scheduled_upgrade_invoice_amount_due = None
         if customer is not None:
             fixed_price_plan_offer = get_configured_fixed_price_plan_offer(customer, tier)
             if fixed_price_plan_offer:
@@ -2407,6 +2423,19 @@ class BillingSession(ABC):
                 if fixed_price_plan_offer.sent_invoice_id is not None:
                     invoice = stripe.Invoice.retrieve(fixed_price_plan_offer.sent_invoice_id)
                     pay_by_invoice_payments_page = invoice.hosted_invoice_url
+            else:
+                # NOTE: Only use `last_send_invoice` to display invoice due information and not to verify payment.
+                last_send_invoice = (
+                    Invoice.objects.filter(customer=customer, status=Invoice.SENT)
+                    .order_by("id")
+                    .last()
+                )
+
+                if last_send_invoice is not None:
+                    invoice = stripe.Invoice.retrieve(last_send_invoice.stripe_invoice_id)
+                    if invoice is not None:
+                        scheduled_upgrade_invoice_amount_due = format_money(invoice.amount_due)
+                        pay_by_invoice_payments_page = f"{self.billing_base_url}/invoices"
 
         percent_off = Decimal(0)
         if customer is not None:
@@ -2416,6 +2445,12 @@ class BillingSession(ABC):
 
         customer_specific_context = self.get_upgrade_page_session_type_specific_context()
         min_licenses_for_plan = self.min_licenses_for_plan(tier)
+
+        setup_payment_by_invoice = initial_upgrade_request.billing_modality == "send_invoice"
+        # Regardless of value passed, invoice payments always have manual license management.
+        if setup_payment_by_invoice:
+            initial_upgrade_request.manual_license_management = True
+
         seat_count = self.current_count_for_billed_licenses()
         using_min_licenses_for_plan = min_licenses_for_plan > seat_count
         if using_min_licenses_for_plan:
@@ -2450,7 +2485,6 @@ class BillingSession(ABC):
             "discount_percent": format_discount_percentage(percent_off),
             "email": customer_specific_context["email"],
             "exempt_from_license_number_check": exempt_from_license_number_check,
-            "free_trial_days": free_trial_days,
             "free_trial_end_date": free_trial_end_date,
             "is_demo_organization": customer_specific_context["is_demo_organization"],
             "remote_server_legacy_plan_end_date": remote_server_legacy_plan_end_date,
@@ -2472,6 +2506,8 @@ class BillingSession(ABC):
                 "flat_discount": flat_discount,
                 "flat_discounted_months": flat_discounted_months,
                 "fixed_price": fixed_price,
+                "setup_payment_by_invoice": setup_payment_by_invoice,
+                "free_trial_days": free_trial_days,
             },
             "using_min_licenses_for_plan": using_min_licenses_for_plan,
             "min_licenses_for_plan": min_licenses_for_plan,
@@ -2487,6 +2523,7 @@ class BillingSession(ABC):
             "sponsorship_plan_name": self.get_sponsorship_plan_name(
                 customer, is_self_hosted_billing
             ),
+            "scheduled_upgrade_invoice_amount_due": scheduled_upgrade_invoice_amount_due,
         }
 
         return None, context
diff --git a/corporate/lib/stripe_event_handler.py b/corporate/lib/stripe_event_handler.py
index 7929fbc264..df8fee7ed3 100644
--- a/corporate/lib/stripe_event_handler.py
+++ b/corporate/lib/stripe_event_handler.py
@@ -142,13 +142,22 @@ def handle_invoice_paid_event(stripe_invoice: stripe.Invoice, invoice: Invoice)
             remote_server_legacy_plan=remote_server_legacy_plan,
             stripe_invoice_paid=True,
         )
-    elif stripe_invoice.collection_method == "charge_automatically":
+    else:
         metadata = stripe_invoice.metadata
-        assert metadata is not None
+        # Only process upgrade required if metadata has the required keys.
+        # This is a safeguard to avoid processing custom invoices.
+        if (
+            metadata is None
+            or metadata.get("billing_schedule") is None
+            or metadata.get("plan_tier") is None
+        ):  # nocoverage
+            return
+
         billing_session = get_billing_session_for_stripe_webhook(customer, metadata.get("user_id"))
         remote_server_legacy_plan = billing_session.get_remote_server_legacy_plan(customer)
         billing_schedule = int(metadata["billing_schedule"])
         plan_tier = int(metadata["plan_tier"])
+        charge_automatically = stripe_invoice.collection_method != "send_invoice"
         if configured_fixed_price_plan and customer.required_plan_tier == plan_tier:
             assert customer.required_plan_tier is not None
             billing_session.process_initial_upgrade(
@@ -158,7 +167,7 @@ def handle_invoice_paid_event(stripe_invoice: stripe.Invoice, invoice: Invoice)
                 licenses=0,
                 automanage_licenses=True,
                 billing_schedule=billing_schedule,
-                charge_automatically=True,
+                charge_automatically=charge_automatically,
                 free_trial=False,
                 remote_server_legacy_plan=remote_server_legacy_plan,
                 stripe_invoice_paid=True,
@@ -169,7 +178,7 @@ def handle_invoice_paid_event(stripe_invoice: stripe.Invoice, invoice: Invoice)
                 int(metadata["licenses"]),
                 metadata["license_management"] == "automatic",
                 billing_schedule=billing_schedule,
-                charge_automatically=True,
+                charge_automatically=charge_automatically,
                 free_trial=False,
                 remote_server_legacy_plan=remote_server_legacy_plan,
                 stripe_invoice_paid=True,
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Charge.list.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Charge.list.1.json
index b5f84e02a5..8f23e86216 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Charge.list.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Charge.list.1.json
@@ -51,7 +51,7 @@
       },
       "paid": true,
       "payment_intent": "pi_NORMALIZED00000000000001",
-      "payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+      "payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
       "payment_method_details": {
         "card": {
           "amount_authorized": 100000,
@@ -62,7 +62,7 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "exp_month": 3,
           "exp_year": 2025,
           "extended_authorization": {
             "status": "disabled"
@@ -94,7 +94,7 @@
       "radar_options": {},
       "receipt_email": "hamlet@zulip.com",
       "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLznmK4GMgbnQYxjhBw6LBYBJfXa5qHpbXfK0MWh-a77wSrWrSEhmiZv5jEREazEoXZ9M4BTPLXUOeWS?s=ap",
+      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNiUla8GMgZ_ljqDf6M6LBbtbQO8AROadME8ipwPmsZHUT4URg08PNLOVwK_b7-ECq_20-N2xIiotjEY?s=ap",
       "refunded": false,
       "refunds": {
         "data": [],
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.modify.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.modify.1.json
index cb3389466e..958987b136 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+    "default_payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.1.json
index d196ad5abd..bfede9903f 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusIDEQaroqDjsutT8G94V",
+      "id": "pm_1OqStgDEQaroqDjsWwM9p7MO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.2.json
index d196ad5abd..bfede9903f 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusIDEQaroqDjsutT8G94V",
+      "id": "pm_1OqStgDEQaroqDjsWwM9p7MO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.3.json
index d196ad5abd..bfede9903f 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusIDEQaroqDjsutT8G94V",
+      "id": "pm_1OqStgDEQaroqDjsWwM9p7MO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.4.json
index d196ad5abd..bfede9903f 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusIDEQaroqDjsutT8G94V",
+      "id": "pm_1OqStgDEQaroqDjsWwM9p7MO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.1.json
index e797bbc284..e022825708 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+            "default_payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhusKDEQaroqDjsF1xldWQu",
+      "id": "evt_1OqSthDEQaroqDjs3FrenIgp",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "aaae7c78-84d2-4aac-879f-f50194f991be"
+        "idempotency_key": "09a5780f-2bf1-4660-bf9c-f1aa4f18cd13"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.2.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.2.json
index 8d0be37d9d..048a77d733 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+                "payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 100000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLrnmK4GMgZaAIFMepE6LBZ2MfIIjjsxKG1U1L_SUyPo6mHQODBgT2Sl2Bs8_lKheGmwwel3SPhEBwcV?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNeUla8GMgYA-AmoaxQ6LBbyBqcTCsmVPEfPRSXlL0IZVH3zY85aDKZBv1QJuqOZcFE98XEJOkXWm3__?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_8FzaavQlYjlpSAwc6ftYy3axP",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_W8vLOxdRtCTwR7IapNFkz9qfQ",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+          "payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhusNDEQaroqDjs0khN83aR",
+      "id": "evt_3OqStlDEQaroqDjs1O9wh5QC",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "0d9c606c-1f37-4dcf-b9df-97d5b4f0754d"
+        "idempotency_key": "bed5b9c8-0e7e-4b52-ab19-5da5bba6bd04"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 100000,
+          "amount_captured": 100000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 100000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 100000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNeUla8GMgYU586YGsQ6LBZuRxx51qruAFYjjF-Gz8b_w7NcXaJEVusxXCZKpi-BrjHXtB5LMMNQWO5x?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqStlDEQaroqDjs1IiGjzI1",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bed5b9c8-0e7e-4b52-ab19-5da5bba6bd04"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg002000E8VWplT?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM4OQ02001awFQMCJ?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg002000E8VWplT/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM4OQ02001awFQMCJ/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -361,16 +490,16 @@
           "total_excluding_tax": 100000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusODEQaroqDjsTcL0dmry",
+      "id": "evt_1OqStlDEQaroqDjsX6DQaEiI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "dddcaee0-e3b9-410d-a0d7-7125a8eb42d7"
+        "idempotency_key": "539038fe-0470-4e9e-9429-7a85aafab47f"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg002000E8VWplT?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM4OQ02001awFQMCJ?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg002000E8VWplT/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM4OQ02001awFQMCJ/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -544,7 +674,7 @@
           "total_excluding_tax": 100000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhusODEQaroqDjsKPSd9ZOc",
+      "id": "evt_1OqStlDEQaroqDjsyBfQ0x2v",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "dddcaee0-e3b9-410d-a0d7-7125a8eb42d7"
+        "idempotency_key": "539038fe-0470-4e9e-9429-7a85aafab47f"
       },
       "type": "invoice.updated"
     },
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_8FzaavQlYjlpSAwc6ftYy3axP",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_W8vLOxdRtCTwR7IapNFkz9qfQ",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhusNDEQaroqDjs0GasvTXI",
+      "id": "evt_3OqStlDEQaroqDjs11cMMFiA",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "dddcaee0-e3b9-410d-a0d7-7125a8eb42d7"
+        "idempotency_key": "539038fe-0470-4e9e-9429-7a85aafab47f"
       },
       "type": "payment_intent.created"
     },
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -821,16 +952,16 @@
           "total_excluding_tax": 100000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusNDEQaroqDjsdp7nMao5",
+      "id": "evt_1OqStkDEQaroqDjsZ76dRfSB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "4967241f-b119-4c33-a434-8165a5918660"
+        "idempotency_key": "a7d699f5-b2b9-4188-b89e-bdec4180b74d"
       },
       "type": "invoice.created"
     },
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "4000"
         }
       },
-      "id": "evt_1OhusMDEQaroqDjsHfgQIsiY",
+      "id": "evt_1OqStkDEQaroqDjsNg850ZRb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "a5edef93-cd5a-428d-8713-4dbfe7b55666"
+        "idempotency_key": "04f75f96-4c18-4e35-a8c1-70c64ba8677e"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+            "default_payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhusMDEQaroqDjsAWFLyHeL",
+      "id": "evt_1OqStkDEQaroqDjsmWgCAvgu",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "a5edef93-cd5a-428d-8713-4dbfe7b55666"
+        "idempotency_key": "04f75f96-4c18-4e35-a8c1-70c64ba8677e"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.3.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.3.json
index 33b829f854..caf16a8fbd 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg30200WaARXNdd?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MQ0200eQml8yt4?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg30200WaARXNdd/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MQ0200eQml8yt4/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,375 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 4000,
+                  "unit_amount_decimal": "4000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 25,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "4000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "25",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 100000,
+          "subtotal_excluding_tax": 100000,
+          "tax": null,
+          "test_clock": null,
+          "total": 100000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 100000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqStnDEQaroqDjs6yZt1MsH",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bed5b9c8-0e7e-4b52-ab19-5da5bba6bd04"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 100000,
+          "amount_paid": 100000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MQ0200eQml8yt4?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MQ0200eQml8yt4/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 100000,
+                "amount_excluding_tax": 100000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 4000,
+                  "unit_amount_decimal": "4000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 25,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "4000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "25",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 100000,
+          "subtotal_excluding_tax": 100000,
+          "tax": null,
+          "test_clock": null,
+          "total": 100000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 100000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqStnDEQaroqDjsv7P7ynGQ",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bed5b9c8-0e7e-4b52-ab19-5da5bba6bd04"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 100000,
+          "amount_paid": 100000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MQ0200eQml8yt4?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MQ0200eQml8yt4/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 100000,
+                "amount_excluding_tax": 100000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -185,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhusRDEQaroqDjsoMARzuqz",
+      "id": "evt_1OqStnDEQaroqDjsWEIqOSZz",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "0d9c606c-1f37-4dcf-b9df-97d5b4f0754d"
+        "idempotency_key": "bed5b9c8-0e7e-4b52-ab19-5da5bba6bd04"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.4.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.4.json
index 205793a342..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.4.json
@@ -1,372 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 100000,
-          "amount_paid": 100000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg30200WaARXNdd?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg30200WaARXNdd/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 100000,
-                "amount_excluding_tax": 100000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 4000,
-                  "unit_amount_decimal": "4000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 25,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "4000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "25",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 100000,
-          "subtotal_excluding_tax": 100000,
-          "tax": null,
-          "test_clock": null,
-          "total": 100000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 100000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhusRDEQaroqDjsBodX9YOR",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 2,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "0d9c606c-1f37-4dcf-b9df-97d5b4f0754d"
-      },
-      "type": "invoice.payment_succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 100000,
-          "amount_paid": 100000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg30200WaARXNdd?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg30200WaARXNdd/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 100000,
-                "amount_excluding_tax": 100000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 4000,
-                  "unit_amount_decimal": "4000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 25,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "4000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "25",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 100000,
-          "subtotal_excluding_tax": 100000,
-          "tax": null,
-          "test_clock": null,
-          "total": 100000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 100000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhusRDEQaroqDjsUMIaU0um",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "0d9c606c-1f37-4dcf-b9df-97d5b4f0754d"
-      },
-      "type": "invoice.paid"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.create.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.create.1.json
index 8f17e07eb3..a0b98d0659 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 100000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.finalize_invoice.1.json
index b1e702b7a7..ac589ab1e4 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTgz0200WTiG0MeY?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM4OQ02001awFQMCJ?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTgz0200WTiG0MeY/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM4OQ02001awFQMCJ/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 100000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.pay.1.json
index 185d5ea76b..4028fb62c9 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg20200SOndDhT1?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MA0200cLYDWrj5?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZGl2QnR5Y2hXekVjR1pZZUNIUWlBMDhUQWRqLDk4MDI4OTg20200SOndDhT1/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUzdWSXpCQzdJRkZXUTBJTkxqY25Oc3ZNN0huLDEwMDA2NjM5MA0200cLYDWrj5/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.create.1.json
index b00d258254..6fcf50c4aa 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusIDEQaroqDjsNCn1B9ZP_secret_PWypACJ8j8p0GkeaqRlkLaHtItaHyDQ",
+  "client_secret": "seti_1OqStgDEQaroqDjs0ljEjFIc_secret_PfoWJP49Vqa0iZFngoUv8334N5OSHv8",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusIDEQaroqDjsNCn1B9ZP",
+  "id": "seti_1OqStgDEQaroqDjs0ljEjFIc",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusIDEQaroqDjsUIACFNfl",
+  "latest_attempt": "setatt_1OqStgDEQaroqDjseEhNL0Ms",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+  "payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.list.1.json
index 7d879eba8d..238bcf742e 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhusHDEQaroqDjs04o9oGoA_secret_PWypRy8sKmv1r1ulkKBcmQnfhHhVQhS",
+      "client_secret": "seti_1OqStfDEQaroqDjsy3HnXbdM_secret_PfoWTDfFgwid0sHoP76Dfvot3WfdNQt",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhusHDEQaroqDjs04o9oGoA",
+      "id": "seti_1OqStfDEQaroqDjsy3HnXbdM",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.retrieve.1.json
index b00d258254..6fcf50c4aa 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusIDEQaroqDjsNCn1B9ZP_secret_PWypACJ8j8p0GkeaqRlkLaHtItaHyDQ",
+  "client_secret": "seti_1OqStgDEQaroqDjs0ljEjFIc_secret_PfoWJP49Vqa0iZFngoUv8334N5OSHv8",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusIDEQaroqDjsNCn1B9ZP",
+  "id": "seti_1OqStgDEQaroqDjs0ljEjFIc",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusIDEQaroqDjsUIACFNfl",
+  "latest_attempt": "setatt_1OqStgDEQaroqDjseEhNL0Ms",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusIDEQaroqDjsutT8G94V",
+  "payment_method": "pm_1OqStgDEQaroqDjsWwM9p7MO",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.create.1.json
index 142202b2e3..6651463d3f 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02lk5YnKfxGCMo0iczh2TqJfUG70DbsZQ2fMB2TuVn2ZIQht",
+  "id": "cs_test_NORMALIZED02vJj0Xr1bNanjMVFw7lgeay9VgpaRoeJhWwaTZk2b4CTTC5",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhusHDEQaroqDjs04o9oGoA",
+  "setup_intent": "seti_1OqStfDEQaroqDjsy3HnXbdM",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02lk5YnKfxGCMo0iczh2TqJfUG70DbsZQ2fMB2TuVn2ZIQht#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vJj0Xr1bNanjMVFw7lgeay9VgpaRoeJhWwaTZk2b4CTTC5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.list.1.json
index 8d845ca175..a563a736c8 100644
--- a/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02lk5YnKfxGCMo0iczh2TqJfUG70DbsZQ2fMB2TuVn2ZIQht",
+      "id": "cs_test_NORMALIZED02vJj0Xr1bNanjMVFw7lgeay9VgpaRoeJhWwaTZk2b4CTTC5",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhusHDEQaroqDjs04o9oGoA",
+      "setup_intent": "seti_1OqStfDEQaroqDjsy3HnXbdM",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02lk5YnKfxGCMo0iczh2TqJfUG70DbsZQ2fMB2TuVn2ZIQht#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vJj0Xr1bNanjMVFw7lgeay9VgpaRoeJhWwaTZk2b4CTTC5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.1.json
index f220f28e5e..b79af6d104 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.1.json
@@ -51,7 +51,7 @@
       },
       "paid": true,
       "payment_intent": "pi_NORMALIZED00000000000001",
-      "payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+      "payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
       "payment_method_details": {
         "card": {
           "amount_authorized": 7200,
@@ -62,7 +62,7 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "exp_month": 3,
           "exp_year": 2025,
           "extended_authorization": {
             "status": "disabled"
@@ -94,7 +94,7 @@
       "radar_options": {},
       "receipt_email": "hamlet@zulip.com",
       "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMjnmK4GMgYM1wHT71o6LBYBNhPWloGWW5LXISP5Ae4kpxGzcqh-TaPNxBsVnPJNO6tGMyx-DGbgAJ8E?s=ap",
+      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOOUla8GMgaDq8DDpZg6LBbv31E3zueUvwYq3uIlJrVrusTHsRxd2RtELfEmOROjozmVolYO9ESfR6Uf?s=ap",
       "refunded": false,
       "refunds": {
         "data": [],
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.2.json
index 92ccfa3853..c8cfc7c9a4 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.2.json
@@ -51,7 +51,7 @@
       },
       "paid": true,
       "payment_intent": "pi_NORMALIZED00000000000002",
-      "payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+      "payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
       "payment_method_details": {
         "card": {
           "amount_authorized": 36000,
@@ -62,7 +62,7 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "exp_month": 3,
           "exp_year": 2025,
           "extended_authorization": {
             "status": "disabled"
@@ -94,7 +94,7 @@
       "radar_options": {},
       "receipt_email": "hamlet@zulip.com",
       "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNLnmK4GMgawzbFwPYM6LBZZOoP4rbFzhhF18-7YC5SYZeENpbBT57aiah9zmY91YgEoHkUGMWPXEzAd?s=ap",
+      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKO2Ula8GMgbtfXVX1aE6LBbIlCRvYBim_bJ3eAAP6uESaSC4r9XAvSc4h-osIDZTrJ2OUMFi78qgxAda?s=ap",
       "refunded": false,
       "refunds": {
         "data": [],
@@ -164,7 +164,7 @@
       },
       "paid": true,
       "payment_intent": "pi_NORMALIZED00000000000001",
-      "payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+      "payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
       "payment_method_details": {
         "card": {
           "amount_authorized": 7200,
@@ -175,7 +175,7 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "exp_month": 3,
           "exp_year": 2025,
           "extended_authorization": {
             "status": "disabled"
@@ -207,7 +207,7 @@
       "radar_options": {},
       "receipt_email": "hamlet@zulip.com",
       "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNLnmK4GMgZOw9ITYdQ6LBYqT_OTq9sggStFhgXDKsockZu22dNUILWJUjKspT9VgIVSPIP2nlhx45dl?s=ap",
+      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKO2Ula8GMgbjxhDSSQI6LBYLEj7Ps1awfBoOqg0H35xKSEo7AdL3zmjLwiKhsOneaYzLY_LyPuQ91Igj?s=ap",
       "refunded": false,
       "refunds": {
         "data": [],
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.1.json
index fbb2a7b033..1542026672 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+    "default_payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.2.json
index bc2c1cd6f4..282c1a0fc7 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.2.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+    "default_payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json
index 3743792e5f..ca13910b92 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusUDEQaroqDjshMg71tMy",
+      "id": "pm_1OqStqDEQaroqDjs6pAvfeVl",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.2.json
index 3743792e5f..ca13910b92 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusUDEQaroqDjshMg71tMy",
+      "id": "pm_1OqStqDEQaroqDjs6pAvfeVl",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.3.json
index 3743792e5f..ca13910b92 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusUDEQaroqDjshMg71tMy",
+      "id": "pm_1OqStqDEQaroqDjs6pAvfeVl",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.4.json
index 3743792e5f..ca13910b92 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusUDEQaroqDjshMg71tMy",
+      "id": "pm_1OqStqDEQaroqDjs6pAvfeVl",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.5.json
index a0e05b2f3f..e0492aed3e 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusfDEQaroqDjsBZazbR99",
+      "id": "pm_1OqSu1DEQaroqDjsmoCTRlki",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.6.json
index a0e05b2f3f..e0492aed3e 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusfDEQaroqDjsBZazbR99",
+      "id": "pm_1OqSu1DEQaroqDjsmoCTRlki",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.7.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.7.json
index a0e05b2f3f..e0492aed3e 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.7.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.7.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusfDEQaroqDjsBZazbR99",
+      "id": "pm_1OqSu1DEQaroqDjsmoCTRlki",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.8.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.8.json
index a0e05b2f3f..e0492aed3e 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.8.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.8.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusfDEQaroqDjsBZazbR99",
+      "id": "pm_1OqSu1DEQaroqDjsmoCTRlki",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.1.json
index ee76a0c053..88ad6ecf79 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+            "default_payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhusWDEQaroqDjsUUGMVLHh",
+      "id": "evt_1OqStsDEQaroqDjs0151qJJc",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "478ee412-4592-47e3-9b9c-cee2954a4b5a"
+        "idempotency_key": "db646367-fcd4-4f28-aaae-520c2f678d6b"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.2.json
index 1281afe49d..69e74ef543 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+                "payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 7200,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMbnmK4GMgYOlnqO2Gg6LBaqsvFAFLyM5IBhHEaOiF08jG8nxWIO3oQrVB5lI-xbq41RgnZvjjRd-20K?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOKUla8GMgYX5NyHxfw6LBYju_lxI-A61CdUDkLp4lrPpINsGNMrlFvwIdNr3sph0VBvFAcIso3cL2VE?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_swL9KJa1XQeYZSLGln5q4tmkn",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_Vve3SsLl4KGZD7UWpha7ECVBr",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+          "payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhusZDEQaroqDjs0QanKu8S",
+      "id": "evt_3OqStwDEQaroqDjs0hDzlKG6",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "c8edfdb6-feb8-4113-a5db-6dc2e10dc7fd"
+        "idempotency_key": "4a6fe2ba-0eae-480f-b86c-c594994f0d01"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 7200,
+          "amount_captured": 7200,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 7200,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 7200,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOKUla8GMgbCvm82exk6LBYtGURYAvsym2hCe-WJ7OzxP5dJgCZ9avBNjp8p5iHtsz-XzfrIH-vQq10A?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqStwDEQaroqDjs0tqa9Wm5",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "4a6fe2ba-0eae-480f-b86c-c594994f0d01"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk20200RGFXsaBq?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMA020003VYz500?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk20200RGFXsaBq/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMA020003VYz500/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -361,16 +490,16 @@
           "total_excluding_tax": 7200,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusaDEQaroqDjs1oO95kCc",
+      "id": "evt_1OqStwDEQaroqDjspiAixOsm",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "9f7e3bc6-f75e-40fb-aacb-ad32485b5d66"
+        "idempotency_key": "b27c34f9-d87b-48d2-bf11-3d34cd1d1f59"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk20200RGFXsaBq?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMA020003VYz500?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk20200RGFXsaBq/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMA020003VYz500/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -544,7 +674,7 @@
           "total_excluding_tax": 7200,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhusaDEQaroqDjs5Z2Rr01v",
+      "id": "evt_1OqStwDEQaroqDjs5zDiKEc8",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "9f7e3bc6-f75e-40fb-aacb-ad32485b5d66"
+        "idempotency_key": "b27c34f9-d87b-48d2-bf11-3d34cd1d1f59"
       },
       "type": "invoice.updated"
     },
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_swL9KJa1XQeYZSLGln5q4tmkn",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_Vve3SsLl4KGZD7UWpha7ECVBr",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhusZDEQaroqDjs0QI86owM",
+      "id": "evt_3OqStwDEQaroqDjs0kSmtZ82",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "9f7e3bc6-f75e-40fb-aacb-ad32485b5d66"
+        "idempotency_key": "b27c34f9-d87b-48d2-bf11-3d34cd1d1f59"
       },
       "type": "payment_intent.created"
     },
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -821,16 +952,16 @@
           "total_excluding_tax": 7200,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusZDEQaroqDjsKMrLRlNE",
+      "id": "evt_1OqStvDEQaroqDjsvu3rZLOv",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "73c6a44e-32bd-4245-b72e-0bf43def3942"
+        "idempotency_key": "5e5ac0f7-a5b5-461b-aaaf-1fb209edc6cd"
       },
       "type": "invoice.created"
     },
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "1200"
         }
       },
-      "id": "evt_1OhusYDEQaroqDjsUssf75iu",
+      "id": "evt_1OqStvDEQaroqDjsf2X7Pm5s",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "217d44de-f0b6-4960-b8ca-351bb9e6b7ce"
+        "idempotency_key": "509ab6f6-41d0-495c-af80-768e13096354"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+            "default_payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhusYDEQaroqDjsDx1C3Ahx",
+      "id": "evt_1OqStvDEQaroqDjsFgGlFMij",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "217d44de-f0b6-4960-b8ca-351bb9e6b7ce"
+        "idempotency_key": "509ab6f6-41d0-495c-af80-768e13096354"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.3.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.3.json
index 96a48010a7..40616039e9 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk50200QyHIV7Ei?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk50200QyHIV7Ei/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusdDEQaroqDjsOiB9kc6q",
+      "id": "evt_1OqStyDEQaroqDjsA02AAopt",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "c8edfdb6-feb8-4113-a5db-6dc2e10dc7fd"
+        "idempotency_key": "4a6fe2ba-0eae-480f-b86c-c594994f0d01"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk50200QyHIV7Ei?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk50200QyHIV7Ei/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +250,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -356,13 +358,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusdDEQaroqDjs9gLH36CP",
+      "id": "evt_1OqStyDEQaroqDjsN9DbRNGA",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "c8edfdb6-feb8-4113-a5db-6dc2e10dc7fd"
+        "idempotency_key": "4a6fe2ba-0eae-480f-b86c-c594994f0d01"
       },
       "type": "invoice.paid"
     },
@@ -413,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk40200F3zsSK4O?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk40200F3zsSK4O/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -432,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -551,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhuscDEQaroqDjsImxB1l0G",
+      "id": "evt_1OqStyDEQaroqDjsJ8W3qZ1G",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "c8edfdb6-feb8-4113-a5db-6dc2e10dc7fd"
+        "idempotency_key": "4a6fe2ba-0eae-480f-b86c-c594994f0d01"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.5.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.5.json
index 3a6b122087..d6c9628223 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.5.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.5.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+            "default_payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
             "footer": null,
             "rendering_options": null
           },
@@ -39,17 +39,17 @@
         },
         "previous_attributes": {
           "invoice_settings": {
-            "default_payment_method": "pm_1OhusUDEQaroqDjshMg71tMy"
+            "default_payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl"
           }
         }
       },
-      "id": "evt_1OhushDEQaroqDjsiYEoa3yL",
+      "id": "evt_1OqSu2DEQaroqDjsQdf8UcdE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "d34d5096-4375-478c-800f-93b16a9a9290"
+        "idempotency_key": "1b520805-5132-42d8-b10c-b20cff59a326"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.6.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.6.json
index 4a5c900518..e2835e1202 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.6.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.6.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000002",
-                "payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+                "payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 36000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNHnmK4GMgYTFoZaxls6LBaHjVgzZOLodZjlC2pJR4dwWAGXvn6xy7gQ998_nwPUsEBdEJI0BHDvqdlp?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOyUla8GMgZA_9Jv-PM6LBat8ey99Kslv7SvwP3c5OfvNoquvEVODNwhQRxeE8DfF0xeVce38joF4TOF?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
           },
-          "client_secret": "pi_NORMALIZED00000000000002_secret_5vRd5hPlN3Nmv5bB0jDQtqynE",
+          "client_secret": "pi_NORMALIZED00000000000002_secret_yl5VxBviB2nveSOBjLECHgDiu",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+          "payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuskDEQaroqDjs1tc0YeMM",
+      "id": "evt_3OqSu6DEQaroqDjs13a8Iwcl",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0007",
-        "idempotency_key": "e0a2e284-aace-49e4-a4c8-75c1606c7341"
+        "idempotency_key": "a0c86d90-09cc-4175-8f6e-8c5df67f82e6"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+          "payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
           "payment_method_details": {
             "card": {
               "amount_authorized": 36000,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNHnmK4GMgaeJfST3gE6LBYKWv02X1sDv8x76l7yfiuer1y_nQr5Oyjf0iiF8G7nuRWlkDP9rrBg1ZRS?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOyUla8GMgaVrlxj4Ww6LBavRIw4Ak9ApU3NtS-5XBOCKtgDGz1ckMjbK7zrjT4ZYX5b1hso1yM3Unns?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuskDEQaroqDjs1QVJjypf",
+      "id": "evt_3OqSu6DEQaroqDjs1RlB00Ds",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0007",
-        "idempotency_key": "e0a2e284-aace-49e4-a4c8-75c1606c7341"
+        "idempotency_key": "a0c86d90-09cc-4175-8f6e-8c5df67f82e6"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA30200JlxIhv7k?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMA0200jCP2XuhX?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA30200JlxIhv7k/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMA0200jCP2XuhX/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -489,16 +490,16 @@
           "total_excluding_tax": 36000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuslDEQaroqDjsI8CpL8W9",
+      "id": "evt_1OqSu6DEQaroqDjsXAB01NBJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0008",
-        "idempotency_key": "2014145b-d6db-4125-b073-5c0783e87cb7"
+        "idempotency_key": "1ad3c606-30ae-4e81-ae02-49a2852fb384"
       },
       "type": "invoice.finalized"
     },
@@ -549,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA30200JlxIhv7k?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMA0200jCP2XuhX?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA30200JlxIhv7k/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMA0200jCP2XuhX/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -568,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -672,7 +674,7 @@
           "total_excluding_tax": 36000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -692,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhuslDEQaroqDjs220DUx1p",
+      "id": "evt_1OqSu6DEQaroqDjss6DjtJcP",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0008",
-        "idempotency_key": "2014145b-d6db-4125-b073-5c0783e87cb7"
+        "idempotency_key": "1ad3c606-30ae-4e81-ae02-49a2852fb384"
       },
       "type": "invoice.updated"
     },
@@ -726,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
           },
-          "client_secret": "pi_NORMALIZED00000000000002_secret_5vRd5hPlN3Nmv5bB0jDQtqynE",
+          "client_secret": "pi_NORMALIZED00000000000002_secret_yl5VxBviB2nveSOBjLECHgDiu",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -769,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuskDEQaroqDjs1ddRdJfu",
+      "id": "evt_3OqSu6DEQaroqDjs1nX4uGkn",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0008",
-        "idempotency_key": "2014145b-d6db-4125-b073-5c0783e87cb7"
+        "idempotency_key": "1ad3c606-30ae-4e81-ae02-49a2852fb384"
       },
       "type": "payment_intent.created"
     },
@@ -845,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -949,16 +952,16 @@
           "total_excluding_tax": 36000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuskDEQaroqDjsljEKLzS7",
+      "id": "evt_1OqSu5DEQaroqDjsZFlqNMY7",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0009",
-        "idempotency_key": "68e6f4e0-63bd-4f25-bdbc-843dc7b7dcc8"
+        "idempotency_key": "b432be84-c39f-4c62-b785-cf16c9c12d42"
       },
       "type": "invoice.created"
     },
@@ -1014,13 +1017,13 @@
           "unit_amount_decimal": "6000"
         }
       },
-      "id": "evt_1OhusjDEQaroqDjs247aTNCy",
+      "id": "evt_1OqSu5DEQaroqDjslX2EDvKZ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0010",
-        "idempotency_key": "0943cbed-e696-4acf-92fd-2971f02796c9"
+        "idempotency_key": "b2a9f56a-caed-42ec-a318-74e07bcb4a6d"
       },
       "type": "invoiceitem.created"
     }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.7.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.7.json
index 7142da8b73..74732a9f32 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.7.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.7.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA50200EerDhNPY?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMg0200nyUJR1Vh?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA50200EerDhNPY/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMg0200nyUJR1Vh/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusnDEQaroqDjshhd8QMKO",
+      "id": "evt_1OqSu8DEQaroqDjsyQwVwCkB",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0007",
-        "idempotency_key": "e0a2e284-aace-49e4-a4c8-75c1606c7341"
+        "idempotency_key": "a0c86d90-09cc-4175-8f6e-8c5df67f82e6"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA50200EerDhNPY?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMg0200nyUJR1Vh?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA50200EerDhNPY/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMg0200nyUJR1Vh/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +250,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -356,13 +358,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhusnDEQaroqDjsDqkPmlHX",
+      "id": "evt_1OqSu8DEQaroqDjsIcTWaLZc",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0007",
-        "idempotency_key": "e0a2e284-aace-49e4-a4c8-75c1606c7341"
+        "idempotency_key": "a0c86d90-09cc-4175-8f6e-8c5df67f82e6"
       },
       "type": "invoice.paid"
     },
@@ -413,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA50200EerDhNPY?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMg0200nyUJR1Vh?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA50200EerDhNPY/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMg0200nyUJR1Vh/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -432,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -551,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhusnDEQaroqDjsd5QVDXWP",
+      "id": "evt_1OqSu8DEQaroqDjsD8viyGJQ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0007",
-        "idempotency_key": "e0a2e284-aace-49e4-a4c8-75c1606c7341"
+        "idempotency_key": "a0c86d90-09cc-4175-8f6e-8c5df67f82e6"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.1.json
index 2475e0217a..d1bd9148fb 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 7200,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.2.json
index 2be70520de..3299a35c19 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 36000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.3.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.3.json
index fbc686b964..e58eacffb5 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.3.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 24000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.1.json
index ee033f8aac..728d3b442e 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk20200RGFXsaBq?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMA020003VYz500?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk20200RGFXsaBq/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMA020003VYz500/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 7200,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.2.json
index ec5e59f1a7..0303c4e2e3 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA20200U0s5dgaq?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMA0200jCP2XuhX?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA20200U0s5dgaq/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMA0200jCP2XuhX/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 36000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.3.json
index f2d44c3049..34f25bf64c 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxNkg1M3Z6Q3hoVEpiYU9Nd2lVNW84NzBzVExVLDk4MDI5MDEy02006czIBBzk?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YY2dvQndFbHU1Rkdsc1BHUnJuS2sxRGh2VTJ6LDEwMDA2NjQxNQ0200pEINKjOO?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxNkg1M3Z6Q3hoVEpiYU9Nd2lVNW84NzBzVExVLDk4MDI5MDEy02006czIBBzk/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YY2dvQndFbHU1Rkdsc1BHUnJuS2sxRGh2VTJ6LDEwMDA2NjQxNQ0200pEINKjOO/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.2.json
index 373709bbcf..9811fd4c06 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI5MDAw0200T8TMCTcL?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwNA0200zZ5e6qlI?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI5MDAw0200T8TMCTcL/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwNA0200zZ5e6qlI/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.4.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.4.json
index f0fd722a33..a0202d0900 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.4.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.4.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDEw0200gOE1luLp?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMw0200279GDsEC?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDEw0200gOE1luLp/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMw0200279GDsEC/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -211,9 +212,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI5MDEw0200WYjnm5pX?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQxMw0200xfi7BJbO?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI5MDEw0200WYjnm5pX/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQxMw0200xfi7BJbO/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -230,6 +231,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.5.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.5.json
index 3aacb29efd..403b5cef85 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.5.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.5.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxNkg1M3Z6Q3hoVEpiYU9Nd2lVNW84NzBzVExVLDk4MDI5MDEz0200zw7aOJj1?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YY2dvQndFbHU1Rkdsc1BHUnJuS2sxRGh2VTJ6LDEwMDA2NjQxNg0200vFxlUiFf?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxNkg1M3Z6Q3hoVEpiYU9Nd2lVNW84NzBzVExVLDk4MDI5MDEz0200zw7aOJj1/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YY2dvQndFbHU1Rkdsc1BHUnJuS2sxRGh2VTJ6LDEwMDA2NjQxNg0200vFxlUiFf/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDEz0200FyHRmglp?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxNg020035hz45kj?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDEz0200FyHRmglp/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxNg020035hz45kj/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -373,9 +375,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI5MDEz02007lRnH2t5?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQxNg0200uC6RJrKK?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI5MDEz02007lRnH2t5/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQxNg0200uC6RJrKK/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -392,6 +394,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.1.json
index 3237280669..5ab5ead135 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk40200F3zsSK4O?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxdWhBeGROdnhaaVZnQ3lFMU8xTWxVNVVyZmI0LDk4MDI4OTk40200F3zsSK4O/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Xc0t3MzY2amEzMG9BWVdSdDhSdVJaVlBPWXN5LDEwMDA2NjQwMg0200jVQGaSrT/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.2.json
index 05bfaa8fed..b6dba2fc4e 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA40200lKl8QppH?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMQ0200ONTFV975?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxUnI4VHN1Z29ObUNSSkM3OHJiUVFmN1NqMG5YLDk4MDI5MDA40200lKl8QppH/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcW83Uk1hY05EMXVPTWw5UEdwbE41U3NOSlR1LDEwMDA2NjQxMQ0200ONTFV975/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.1.json
index 243cff60da..113d04bc6c 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusUDEQaroqDjsWdNqYGzV_secret_PWyqfzyFYp98lO4bYFpUiv5t4t8Ukbl",
+  "client_secret": "seti_1OqStrDEQaroqDjsom3QQB6D_secret_PfoWnvcXQbx2BwQ2IwpbCs5T2pfagV3",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusUDEQaroqDjsWdNqYGzV",
+  "id": "seti_1OqStrDEQaroqDjsom3QQB6D",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusUDEQaroqDjsVyveE5F9",
+  "latest_attempt": "setatt_1OqStrDEQaroqDjsLS71wAct",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+  "payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.2.json
index 1759b4f58f..dba8028408 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.2.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusfDEQaroqDjseVRlRt7b_secret_PWyqvShqAPZr72l85jO8jyUFv8F2NFA",
+  "client_secret": "seti_1OqSu1DEQaroqDjsLt1dqxuH_secret_PfoXMs0HsmUEsyvzoh1mMoHRPvUtc3P",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusfDEQaroqDjseVRlRt7b",
+  "id": "seti_1OqSu1DEQaroqDjsLt1dqxuH",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusfDEQaroqDjsqGFtSqZ1",
+  "latest_attempt": "setatt_1OqSu1DEQaroqDjsvlKzEQGT",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+  "payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.1.json
index 4fa0a04712..2f5aecc3d2 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhusTDEQaroqDjsf6IpyMuU_secret_PWyqMTRWwid3g2GBYyrTNwsXD3AOygM",
+      "client_secret": "seti_1OqStqDEQaroqDjs84hyJKCM_secret_PfoW9bu07kLaavmOrKygkOtSNSEYk9d",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhusTDEQaroqDjsf6IpyMuU",
+      "id": "seti_1OqStqDEQaroqDjs84hyJKCM",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.2.json
index 0bab47d851..75032efd51 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.2.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuseDEQaroqDjsaXQxAH3V_secret_PWyqDAGn6mAHEXgfl4w0vhoFxCXQ6ZO",
+      "client_secret": "seti_1OqSu0DEQaroqDjsOsgSrj1S_secret_PfoXVxD34mqLEoDeZNQwgInqrkjZGlh",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuseDEQaroqDjsaXQxAH3V",
+      "id": "seti_1OqSu0DEQaroqDjsOsgSrj1S",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.1.json
index 243cff60da..113d04bc6c 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusUDEQaroqDjsWdNqYGzV_secret_PWyqfzyFYp98lO4bYFpUiv5t4t8Ukbl",
+  "client_secret": "seti_1OqStrDEQaroqDjsom3QQB6D_secret_PfoWnvcXQbx2BwQ2IwpbCs5T2pfagV3",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusUDEQaroqDjsWdNqYGzV",
+  "id": "seti_1OqStrDEQaroqDjsom3QQB6D",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusUDEQaroqDjsVyveE5F9",
+  "latest_attempt": "setatt_1OqStrDEQaroqDjsLS71wAct",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusUDEQaroqDjshMg71tMy",
+  "payment_method": "pm_1OqStqDEQaroqDjs6pAvfeVl",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.2.json
index 1759b4f58f..dba8028408 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.2.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusfDEQaroqDjseVRlRt7b_secret_PWyqvShqAPZr72l85jO8jyUFv8F2NFA",
+  "client_secret": "seti_1OqSu1DEQaroqDjsLt1dqxuH_secret_PfoXMs0HsmUEsyvzoh1mMoHRPvUtc3P",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusfDEQaroqDjseVRlRt7b",
+  "id": "seti_1OqSu1DEQaroqDjsLt1dqxuH",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusfDEQaroqDjsqGFtSqZ1",
+  "latest_attempt": "setatt_1OqSu1DEQaroqDjsvlKzEQGT",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusfDEQaroqDjsBZazbR99",
+  "payment_method": "pm_1OqSu1DEQaroqDjsmoCTRlki",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.1.json
index 242a410512..c5ffa45b7f 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02XnEott6frURqFJsNOeIuQ2TMBS8GH1oQnerKCn85Jww3K3",
+  "id": "cs_test_NORMALIZED02JQkyFtWVALFuntE3oKlgPUVw9GIQDPaRD3nCgbIT92SSwX",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhusTDEQaroqDjsf6IpyMuU",
+  "setup_intent": "seti_1OqStqDEQaroqDjs84hyJKCM",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02XnEott6frURqFJsNOeIuQ2TMBS8GH1oQnerKCn85Jww3K3#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02JQkyFtWVALFuntE3oKlgPUVw9GIQDPaRD3nCgbIT92SSwX#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.2.json
index 93ea0a2a9d..58c4bf331b 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.2.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED03txsegHfeZeLeSR8e9SNm5IIXdf19lQ9zMGywEGqpce8vh2",
+  "id": "cs_test_NORMALIZED03oop3JWiKGItyPW0LSuLCFxfHPIWso5Ic5P6xGCjNBfUUCv",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuseDEQaroqDjsaXQxAH3V",
+  "setup_intent": "seti_1OqSu0DEQaroqDjsOsgSrj1S",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03txsegHfeZeLeSR8e9SNm5IIXdf19lQ9zMGywEGqpce8vh2#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03oop3JWiKGItyPW0LSuLCFxfHPIWso5Ic5P6xGCjNBfUUCv#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.1.json
index 4427d1aca0..0120d1cfae 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02XnEott6frURqFJsNOeIuQ2TMBS8GH1oQnerKCn85Jww3K3",
+      "id": "cs_test_NORMALIZED02JQkyFtWVALFuntE3oKlgPUVw9GIQDPaRD3nCgbIT92SSwX",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhusTDEQaroqDjsf6IpyMuU",
+      "setup_intent": "seti_1OqStqDEQaroqDjs84hyJKCM",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02XnEott6frURqFJsNOeIuQ2TMBS8GH1oQnerKCn85Jww3K3#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02JQkyFtWVALFuntE3oKlgPUVw9GIQDPaRD3nCgbIT92SSwX#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.2.json b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.2.json
index a84dca050f..0164f14966 100644
--- a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.2.json
+++ b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.2.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED03txsegHfeZeLeSR8e9SNm5IIXdf19lQ9zMGywEGqpce8vh2",
+      "id": "cs_test_NORMALIZED03oop3JWiKGItyPW0LSuLCFxfHPIWso5Ic5P6xGCjNBfUUCv",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuseDEQaroqDjsaXQxAH3V",
+      "setup_intent": "seti_1OqSu0DEQaroqDjsOsgSrj1S",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03txsegHfeZeLeSR8e9SNm5IIXdf19lQ9zMGywEGqpce8vh2#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03oop3JWiKGItyPW0LSuLCFxfHPIWso5Ic5P6xGCjNBfUUCv#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.modify.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.modify.1.json
index 37cda2ac7d..884050fbd6 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+    "default_payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json
index a6279adec9..5d38b4ba5b 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+      "id": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json
index a6279adec9..5d38b4ba5b 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+      "id": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.3.json
index a6279adec9..5d38b4ba5b 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+      "id": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.4.json
index a6279adec9..5d38b4ba5b 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+      "id": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.5.json
index 0d0ee92713..a7133f8622 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+      "id": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.6.json
index 0d0ee92713..a7133f8622 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+      "id": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.1.json
index 9dd1fceff4..708c1851b0 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+            "default_payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuiWDEQaroqDjs05RUoY1P",
+      "id": "evt_1OqSj8DEQaroqDjsn3WDx4oe",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "1aef81fd-c771-4b35-ad4f-6a6af5f6d737"
+        "idempotency_key": "421aa86a-9cb1-47b2-80fa-f324266dda82"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.2.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.2.json
index 5b222391f8..eb87e52428 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+                "payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "othello@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNrimK4GMgbtbI8CwLQ6LBYFL-__d7viOBojDqiOKA-yrVQWPbeWwiml97LE-G_s56tYJBN6Pmlk-gCz?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMePla8GMgbrHW90pdc6LBbcl5L0n-CDldB6SKPiKeA0zq4xdm97tTz9X3MriL4sXH1Kic3SIXwP4b4Q?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_7Z6cuctteKXBEfUR9UKxZtXWA",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_SfAxO5hnARB0mxyGm8BMEId0u",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+          "payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuiZDEQaroqDjs1U5Nwh7m",
+      "id": "evt_3OqSjBDEQaroqDjs0SUAp4Nc",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f7492c1f-e728-4d72-ad6b-b76a625aab13"
+        "idempotency_key": "ddbba52c-250c-43f5-85db-726a3239939e"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+          "payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
           "payment_method_details": {
             "card": {
               "amount_authorized": 48000,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "othello@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNrimK4GMgZKIQ2Jgjo6LBapz0VdgvqwMIWrrJcF2jc23qw1vBILMb3bvRltqJ6F6nI9FYoimQBM-E6K?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMePla8GMgZhixRmUsE6LBaRiDnEgkFlORGsfthtESpIbgl03mav2i3z9ehtwL9HNjEj5U5cX84XDd4T?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuiZDEQaroqDjs1u1ea6z0",
+      "id": "evt_3OqSjBDEQaroqDjs0GKHPte0",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f7492c1f-e728-4d72-ad6b-b76a625aab13"
+        "idempotency_key": "ddbba52c-250c-43f5-85db-726a3239939e"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc20200EaAaKpCV?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNA02000fFBUcqH?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc20200EaAaKpCV/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNA02000fFBUcqH/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -489,16 +490,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuiaDEQaroqDjsQQCGEzDC",
+      "id": "evt_1OqSjCDEQaroqDjsKsMega3w",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "20301411-dd2d-4336-bb75-88f63014df7f"
+        "idempotency_key": "ff436f2e-79ce-4155-a3b7-0cbe48479208"
       },
       "type": "invoice.finalized"
     },
@@ -549,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc20200EaAaKpCV?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNA02000fFBUcqH?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc20200EaAaKpCV/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNA02000fFBUcqH/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -568,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -672,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -692,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhuiaDEQaroqDjsKSAmpQXq",
+      "id": "evt_1OqSjCDEQaroqDjsfV55knrw",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "20301411-dd2d-4336-bb75-88f63014df7f"
+        "idempotency_key": "ff436f2e-79ce-4155-a3b7-0cbe48479208"
       },
       "type": "invoice.updated"
     },
@@ -726,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_7Z6cuctteKXBEfUR9UKxZtXWA",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_SfAxO5hnARB0mxyGm8BMEId0u",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -769,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuiZDEQaroqDjs1AXEDjeE",
+      "id": "evt_3OqSjBDEQaroqDjs0AOiY6Yo",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "20301411-dd2d-4336-bb75-88f63014df7f"
+        "idempotency_key": "ff436f2e-79ce-4155-a3b7-0cbe48479208"
       },
       "type": "payment_intent.created"
     },
@@ -845,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -949,16 +952,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuiZDEQaroqDjslCAiFhZR",
+      "id": "evt_1OqSjBDEQaroqDjsFdW8d798",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "70c2caf4-0319-4479-aaa1-68bbb90782c2"
+        "idempotency_key": "9f9bbfe6-e5b5-47ea-a964-cf4afc70ab63"
       },
       "type": "invoice.created"
     },
@@ -1014,13 +1017,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhuiZDEQaroqDjsBn0eL7Nw",
+      "id": "evt_1OqSjADEQaroqDjsTUS77gj3",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "d3301250-8aef-407d-a075-ed0ec67c578e"
+        "idempotency_key": "96355cb8-38bb-4bbd-aa20-f0494b697d9c"
       },
       "type": "invoiceitem.created"
     },
@@ -1043,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+            "default_payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
             "footer": null,
             "rendering_options": null
           },
@@ -1066,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhuiYDEQaroqDjsH2JhnBIk",
+      "id": "evt_1OqSjADEQaroqDjscxgWHxnj",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "d3301250-8aef-407d-a075-ed0ec67c578e"
+        "idempotency_key": "96355cb8-38bb-4bbd-aa20-f0494b697d9c"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.3.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.3.json
index a56510612f..5e33b6ea9b 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNg0200Ac5nOVgI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNg0200Ac5nOVgI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuicDEQaroqDjsVTLDNxnj",
+      "id": "evt_1OqSjEDEQaroqDjskHtxiuuG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f7492c1f-e728-4d72-ad6b-b76a625aab13"
+        "idempotency_key": "ddbba52c-250c-43f5-85db-726a3239939e"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNg0200Ac5nOVgI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNg0200Ac5nOVgI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +250,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -356,13 +358,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuicDEQaroqDjsKMOyfZbl",
+      "id": "evt_1OqSjEDEQaroqDjsoWZr9S2p",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f7492c1f-e728-4d72-ad6b-b76a625aab13"
+        "idempotency_key": "ddbba52c-250c-43f5-85db-726a3239939e"
       },
       "type": "invoice.paid"
     },
@@ -413,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNQ0200QGt0rj8o?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNQ0200QGt0rj8o/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -432,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -551,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhuicDEQaroqDjsuhGhKOTz",
+      "id": "evt_1OqSjEDEQaroqDjs3yAfe0zU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f7492c1f-e728-4d72-ad6b-b76a625aab13"
+        "idempotency_key": "ddbba52c-250c-43f5-85db-726a3239939e"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.create.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.create.1.json
index 7eb8734faa..ac73ac99e4 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.finalize_invoice.1.json
index 13be4cebeb..b41933b5ce 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc20200EaAaKpCV?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNA02000fFBUcqH?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc20200EaAaKpCV/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNA02000fFBUcqH/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.pay.1.json
index 5936577541..b1fe5b2e5c 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNQ0200QGt0rj8o?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmYnBRMmZkSlJBNG95MkRaak1UTHdTQ1hMSzNjLDk4MDI4Mzc40200xNC4bRUA/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MbUJCZlpVSXJrV1lobXh0aUs4b3c3N0pQb2xtLDEwMDA2NTczNQ0200QGt0rj8o/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.create.1.json
index 4e150a58b0..a96d715c60 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuiUDEQaroqDjsy4Gs2GIz_secret_PWyfSmUREeL95Ax6JOHV3Clc6Yg7nfi",
+  "client_secret": "seti_1OqSj6DEQaroqDjskFXu6e9v_secret_PfoLo8AbRrBSWHoZ3TlNE6DXWjgYYT5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuiUDEQaroqDjsy4Gs2GIz",
+  "id": "seti_1OqSj6DEQaroqDjskFXu6e9v",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuiUDEQaroqDjs0qbLPWie",
+  "latest_attempt": "setatt_1OqSj6DEQaroqDjsRP5A9v0b",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+  "payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.list.1.json
index afd8097bba..12f02a1b9d 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuiTDEQaroqDjsh2A3s2pK_secret_PWyfkDMaxdy7yu8Yo1SaqbTuxSYmoGO",
+      "client_secret": "seti_1OqSj5DEQaroqDjs8Jp6z0TK_secret_PfoL577gu7Q4YkzZc5Hh2S2LJAbig2J",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuiTDEQaroqDjsh2A3s2pK",
+      "id": "seti_1OqSj5DEQaroqDjs8Jp6z0TK",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.retrieve.1.json
index 4e150a58b0..a96d715c60 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuiUDEQaroqDjsy4Gs2GIz_secret_PWyfSmUREeL95Ax6JOHV3Clc6Yg7nfi",
+  "client_secret": "seti_1OqSj6DEQaroqDjskFXu6e9v_secret_PfoLo8AbRrBSWHoZ3TlNE6DXWjgYYT5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuiUDEQaroqDjsy4Gs2GIz",
+  "id": "seti_1OqSj6DEQaroqDjskFXu6e9v",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuiUDEQaroqDjs0qbLPWie",
+  "latest_attempt": "setatt_1OqSj6DEQaroqDjsRP5A9v0b",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuiUDEQaroqDjshfqs9wHX",
+  "payment_method": "pm_1OqSj6DEQaroqDjsIT8fDv3h",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.create.1.json
index d50e5b2411..601eebf514 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02UErEeDWqZeiyG07Ri6t63O1nAaksee1KGL18Bzwdbsfsy8",
+  "id": "cs_test_NORMALIZED02XjngGwSRT4XB92ta7BfoEZdGCaVYMlFgaCrwW3Ml1cRPPS",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuiTDEQaroqDjsh2A3s2pK",
+  "setup_intent": "seti_1OqSj5DEQaroqDjs8Jp6z0TK",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02UErEeDWqZeiyG07Ri6t63O1nAaksee1KGL18Bzwdbsfsy8#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02XjngGwSRT4XB92ta7BfoEZdGCaVYMlFgaCrwW3Ml1cRPPS#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.list.1.json
index 3250eb94e6..a60e44e926 100644
--- a/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02UErEeDWqZeiyG07Ri6t63O1nAaksee1KGL18Bzwdbsfsy8",
+      "id": "cs_test_NORMALIZED02XjngGwSRT4XB92ta7BfoEZdGCaVYMlFgaCrwW3Ml1cRPPS",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuiTDEQaroqDjsh2A3s2pK",
+      "setup_intent": "seti_1OqSj5DEQaroqDjs8Jp6z0TK",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02UErEeDWqZeiyG07Ri6t63O1nAaksee1KGL18Bzwdbsfsy8#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02XjngGwSRT4XB92ta7BfoEZdGCaVYMlFgaCrwW3Ml1cRPPS#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.modify.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.modify.1.json
index e32dbf3e03..4b9b97adc0 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuihDEQaroqDjsNBop6Jro",
+    "default_payment_method": "pm_1OqSjIDEQaroqDjsmOhve68R",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.1.json
index c07575fc07..4fa51bf61a 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuihDEQaroqDjsNBop6Jro",
+      "id": "pm_1OqSjIDEQaroqDjsmOhve68R",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.2.json
index c07575fc07..4fa51bf61a 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuihDEQaroqDjsNBop6Jro",
+      "id": "pm_1OqSjIDEQaroqDjsmOhve68R",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.3.json
index c07575fc07..4fa51bf61a 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuihDEQaroqDjsNBop6Jro",
+      "id": "pm_1OqSjIDEQaroqDjsmOhve68R",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Event.list.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Event.list.1.json
index 6b90fb8299..72ada4b64f 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuihDEQaroqDjsNBop6Jro",
+            "default_payment_method": "pm_1OqSjIDEQaroqDjsmOhve68R",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuijDEQaroqDjsb3Zjzq0u",
+      "id": "evt_1OqSjKDEQaroqDjsI5wMvZUI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "7c989a60-ba3b-4e22-aa61-b485384b5c7f"
+        "idempotency_key": "fa240683-6e02-48d8-8c23-ca91f20f5648"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.create.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.create.1.json
index e93949f92f..7f36a74bde 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.finalize_invoice.1.json
index 8461ba5df7..e09177f9a1 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnY2VFTFFoTGhQNUh6VUdxY0t5Y055TXptcGtGLDk4MDI4Mzg40200oAqgXBYF?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NN0RNQklBaDRKblN1SGhLN0M4b1FwMmlaa1YzLDEwMDA2NTc0NQ02001ixA4LHQ?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnY2VFTFFoTGhQNUh6VUdxY0t5Y055TXptcGtGLDk4MDI4Mzg40200oAqgXBYF/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NN0RNQklBaDRKblN1SGhLN0M4b1FwMmlaa1YzLDEwMDA2NTc0NQ02001ixA4LHQ/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.pay.1.json
index aff2d7bd8c..bc0f54c44d 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.pay.1.json
@@ -74,7 +74,7 @@
             },
             "paid": false,
             "payment_intent": "pi_NORMALIZED00000000000001",
-            "payment_method": "pm_1OhuihDEQaroqDjsNBop6Jro",
+            "payment_method": "pm_1OqSjIDEQaroqDjsmOhve68R",
             "payment_method_details": {
               "card": {
                 "amount_authorized": null,
@@ -85,7 +85,7 @@
                   "cvc_check": "pass"
                 },
                 "country": "US",
-                "exp_month": 2,
+                "exp_month": 3,
                 "exp_year": 2025,
                 "extended_authorization": {
                   "status": "disabled"
@@ -136,7 +136,7 @@
         "total_count": 1,
         "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
       },
-      "client_secret": "pi_NORMALIZED00000000000001_secret_Vktqm5KuulInJRf9AmRJ1QSqq",
+      "client_secret": "pi_NORMALIZED00000000000001_secret_nYmIuUiZICRY7wyTWyyJlTA6Y",
       "confirmation_method": "automatic",
       "created": 1010000007,
       "currency": "usd",
@@ -172,7 +172,8 @@
               "cvc_check": "pass"
             },
             "country": "US",
-            "exp_month": 2,
+            "display_brand": "visa",
+            "exp_month": 3,
             "exp_year": 2025,
             "fingerprint": "NORMALIZED000001",
             "funding": "credit",
@@ -191,7 +192,7 @@
           },
           "created": 1010000002,
           "customer": "cus_NORMALIZED0001",
-          "id": "pm_1OhuihDEQaroqDjsNBop6Jro",
+          "id": "pm_1OqSjIDEQaroqDjsmOhve68R",
           "livemode": false,
           "metadata": {},
           "object": "payment_method",
@@ -254,7 +255,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -273,13 +275,13 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuihDEQaroqDjsNBop6Jro",
+      "id": "pm_1OqSjIDEQaroqDjsmOhve68R",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
       "type": "card"
     },
-    "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0002?t=1707487588",
+    "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0002?t=1709524946",
     "setup_intent": null,
     "source": null,
     "type": "card_error"
@@ -292,11 +294,11 @@
     "Access-Control-Max-Age": "300",
     "Cache-Control": "no-cache, no-store",
     "Connection": "keep-alive",
-    "Content-Length": "9158",
+    "Content-Length": "9228",
     "Content-Security-Policy": "report-uri https://q.stripe.com/csp-report?p=v1%2Finvoices%2F%3Ainvoice%2Fpay; block-all-mixed-content; default-src 'none'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; img-src 'self'; script-src 'self' 'report-sample'; style-src 'self'",
     "Content-Type": "application/json",
     "Date": "NORMALIZED DATETIME",
-    "Idempotency-Key": "a31ac4c9-6186-46f6-bc11-945dbab5018c",
+    "Idempotency-Key": "94dc8789-c4ed-4b5a-9569-87682b192253",
     "Original-Request": "req_NORMALIZED0002",
     "Request-Id": "req_NORMALIZED0002",
     "Server": "nginx",
@@ -304,10 +306,9 @@
     "Stripe-Should-Retry": "false",
     "Stripe-Version": "2020-08-27",
     "Vary": "Origin",
-    "X-Stripe-Non-Api-Overhead-Duration-Ms": "2865.0",
     "X-Stripe-Routing-Context-Priority-Tier": "api-testmode"
   },
-  "http_body": "{\"error\": {\"charge\": \"ch_NORMALIZED00000000000001\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_intent\": {\"id\": \"pi_NORMALIZED00000000000001\", \"object\": \"payment_intent\", \"amount\": 48000, \"amount_capturable\": 0, \"amount_details\": {\"tip\": {}}, \"amount_received\": 0, \"application\": null, \"application_fee_amount\": null, \"automatic_payment_methods\": null, \"canceled_at\": null, \"cancellation_reason\": null, \"capture_method\": \"automatic\", \"charges\": {\"object\": \"list\", \"data\": [{\"id\": \"ch_NORMALIZED00000000000001\", \"object\": \"charge\", \"amount\": 48000, \"amount_captured\": 0, \"amount_refunded\": 0, \"application\": null, \"application_fee\": null, \"application_fee_amount\": null, \"balance_transaction\": null, \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"calculated_statement_descriptor\": \"ZULIP CLOUD STANDARD\", \"captured\": false, \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"destination\": null, \"dispute\": null, \"disputed\": false, \"failure_balance_transaction\": null, \"failure_code\": \"card_declined\", \"failure_message\": \"Your card was declined.\", \"fraud_details\": {}, \"invoice\": \"in_NORMALIZED00000000000001\", \"livemode\": false, \"metadata\": {}, \"on_behalf_of\": null, \"order\": null, \"outcome\": {\"network_status\": \"declined_by_network\", \"reason\": \"generic_decline\", \"risk_level\": \"normal\", \"risk_score\": 48, \"seller_message\": \"The bank did not return any further details with this decline.\", \"type\": \"issuer_declined\"}, \"paid\": false, \"payment_intent\": \"pi_NORMALIZED00000000000001\", \"payment_method\": \"pm_1OhuihDEQaroqDjsNBop6Jro\", \"payment_method_details\": {\"card\": {\"amount_authorized\": null, \"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"extended_authorization\": {\"status\": \"disabled\"}, \"fingerprint\": \"NORMALIZED000001\", \"funding\": \"credit\", \"incremental_authorization\": {\"status\": \"unavailable\"}, \"installments\": null, \"last4\": \"0341\", \"mandate\": null, \"multicapture\": {\"status\": \"unavailable\"}, \"network\": \"visa\", \"network_token\": {\"used\": false}, \"overcapture\": {\"maximum_amount_capturable\": 48000, \"status\": \"unavailable\"}, \"three_d_secure\": null, \"wallet\": null}, \"type\": \"card\"}, \"radar_options\": {}, \"receipt_email\": \"hamlet@zulip.com\", \"receipt_number\": null, \"receipt_url\": null, \"refunded\": false, \"refunds\": {\"object\": \"list\", \"data\": [], \"has_more\": false, \"total_count\": 0, \"url\": \"/v1/charges/ch_NORMALIZED00000000000001/refunds\"}, \"review\": null, \"shipping\": null, \"source\": null, \"source_transfer\": null, \"statement_descriptor\": \"Zulip Cloud Standard\", \"statement_descriptor_suffix\": null, \"status\": \"failed\", \"transfer_data\": null, \"transfer_group\": null}], \"has_more\": false, \"total_count\": 1, \"url\": \"/v1/charges?payment_intent=pi_NORMALIZED00000000000001\"}, \"client_secret\": \"pi_NORMALIZED00000000000001_secret_Vktqm5KuulInJRf9AmRJ1QSqq\", \"confirmation_method\": \"automatic\", \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"invoice\": \"in_NORMALIZED00000000000001\", \"last_payment_error\": {\"charge\": \"ch_NORMALIZED00000000000001\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1OhuihDEQaroqDjsNBop6Jro\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000001\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"type\": \"card_error\"}, \"latest_charge\": \"ch_NORMALIZED00000000000001\", \"livemode\": false, \"metadata\": {}, \"next_action\": null, \"on_behalf_of\": null, \"payment_method\": null, \"payment_method_configuration_details\": null, \"payment_method_options\": {\"card\": {\"installments\": null, \"mandate_options\": null, \"network\": null, \"request_three_d_secure\": \"automatic\"}, \"cashapp\": {}}, \"payment_method_types\": [\"card\", \"cashapp\"], \"processing\": null, \"receipt_email\": \"hamlet@zulip.com\", \"review\": null, \"setup_future_usage\": null, \"shipping\": null, \"source\": null, \"statement_descriptor\": \"Zulip Cloud Standard\", \"statement_descriptor_suffix\": null, \"status\": \"requires_payment_method\", \"transfer_data\": null, \"transfer_group\": null}, \"payment_method\": {\"id\": \"pm_1OhuihDEQaroqDjsNBop6Jro\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000001\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"request_log_url\": \"https://dashboard.stripe.com/test/logs/req_NORMALIZED0002?t=1707487588\", \"type\": \"card_error\"}}",
+  "http_body": "{\"error\": {\"charge\": \"ch_NORMALIZED00000000000001\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_intent\": {\"id\": \"pi_NORMALIZED00000000000001\", \"object\": \"payment_intent\", \"amount\": 48000, \"amount_capturable\": 0, \"amount_details\": {\"tip\": {}}, \"amount_received\": 0, \"application\": null, \"application_fee_amount\": null, \"automatic_payment_methods\": null, \"canceled_at\": null, \"cancellation_reason\": null, \"capture_method\": \"automatic\", \"charges\": {\"object\": \"list\", \"data\": [{\"id\": \"ch_NORMALIZED00000000000001\", \"object\": \"charge\", \"amount\": 48000, \"amount_captured\": 0, \"amount_refunded\": 0, \"application\": null, \"application_fee\": null, \"application_fee_amount\": null, \"balance_transaction\": null, \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"calculated_statement_descriptor\": \"ZULIP CLOUD STANDARD\", \"captured\": false, \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"destination\": null, \"dispute\": null, \"disputed\": false, \"failure_balance_transaction\": null, \"failure_code\": \"card_declined\", \"failure_message\": \"Your card was declined.\", \"fraud_details\": {}, \"invoice\": \"in_NORMALIZED00000000000001\", \"livemode\": false, \"metadata\": {}, \"on_behalf_of\": null, \"order\": null, \"outcome\": {\"network_status\": \"declined_by_network\", \"reason\": \"generic_decline\", \"risk_level\": \"normal\", \"risk_score\": 38, \"seller_message\": \"The bank did not return any further details with this decline.\", \"type\": \"issuer_declined\"}, \"paid\": false, \"payment_intent\": \"pi_NORMALIZED00000000000001\", \"payment_method\": \"pm_1OqSjIDEQaroqDjsmOhve68R\", \"payment_method_details\": {\"card\": {\"amount_authorized\": null, \"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 3, \"exp_year\": 2025, \"extended_authorization\": {\"status\": \"disabled\"}, \"fingerprint\": \"NORMALIZED000001\", \"funding\": \"credit\", \"incremental_authorization\": {\"status\": \"unavailable\"}, \"installments\": null, \"last4\": \"0341\", \"mandate\": null, \"multicapture\": {\"status\": \"unavailable\"}, \"network\": \"visa\", \"network_token\": {\"used\": false}, \"overcapture\": {\"maximum_amount_capturable\": 48000, \"status\": \"unavailable\"}, \"three_d_secure\": null, \"wallet\": null}, \"type\": \"card\"}, \"radar_options\": {}, \"receipt_email\": \"hamlet@zulip.com\", \"receipt_number\": null, \"receipt_url\": null, \"refunded\": false, \"refunds\": {\"object\": \"list\", \"data\": [], \"has_more\": false, \"total_count\": 0, \"url\": \"/v1/charges/ch_NORMALIZED00000000000001/refunds\"}, \"review\": null, \"shipping\": null, \"source\": null, \"source_transfer\": null, \"statement_descriptor\": \"Zulip Cloud Standard\", \"statement_descriptor_suffix\": null, \"status\": \"failed\", \"transfer_data\": null, \"transfer_group\": null}], \"has_more\": false, \"total_count\": 1, \"url\": \"/v1/charges?payment_intent=pi_NORMALIZED00000000000001\"}, \"client_secret\": \"pi_NORMALIZED00000000000001_secret_nYmIuUiZICRY7wyTWyyJlTA6Y\", \"confirmation_method\": \"automatic\", \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"invoice\": \"in_NORMALIZED00000000000001\", \"last_payment_error\": {\"charge\": \"ch_NORMALIZED00000000000001\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1OqSjIDEQaroqDjsmOhve68R\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"display_brand\": \"visa\", \"exp_month\": 3, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000001\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"type\": \"card_error\"}, \"latest_charge\": \"ch_NORMALIZED00000000000001\", \"livemode\": false, \"metadata\": {}, \"next_action\": null, \"on_behalf_of\": null, \"payment_method\": null, \"payment_method_configuration_details\": null, \"payment_method_options\": {\"card\": {\"installments\": null, \"mandate_options\": null, \"network\": null, \"request_three_d_secure\": \"automatic\"}, \"cashapp\": {}}, \"payment_method_types\": [\"card\", \"cashapp\"], \"processing\": null, \"receipt_email\": \"hamlet@zulip.com\", \"review\": null, \"setup_future_usage\": null, \"shipping\": null, \"source\": null, \"statement_descriptor\": \"Zulip Cloud Standard\", \"statement_descriptor_suffix\": null, \"status\": \"requires_payment_method\", \"transfer_data\": null, \"transfer_group\": null}, \"payment_method\": {\"id\": \"pm_1OqSjIDEQaroqDjsmOhve68R\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"display_brand\": \"visa\", \"exp_month\": 3, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000001\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"request_log_url\": \"https://dashboard.stripe.com/test/logs/req_NORMALIZED0002?t=1709524946\", \"type\": \"card_error\"}}",
   "http_status": 402,
   "json_body": {
     "error": {
@@ -382,7 +383,7 @@
               },
               "paid": false,
               "payment_intent": "pi_NORMALIZED00000000000001",
-              "payment_method": "pm_1OhuihDEQaroqDjsNBop6Jro",
+              "payment_method": "pm_1OqSjIDEQaroqDjsmOhve68R",
               "payment_method_details": {
                 "card": {
                   "amount_authorized": null,
@@ -393,7 +394,7 @@
                     "cvc_check": "pass"
                   },
                   "country": "US",
-                  "exp_month": 2,
+                  "exp_month": 3,
                   "exp_year": 2025,
                   "extended_authorization": {
                     "status": "disabled"
@@ -450,7 +451,7 @@
           "total_count": 1,
           "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
         },
-        "client_secret": "pi_NORMALIZED00000000000001_secret_Vktqm5KuulInJRf9AmRJ1QSqq",
+        "client_secret": "pi_NORMALIZED00000000000001_secret_nYmIuUiZICRY7wyTWyyJlTA6Y",
         "confirmation_method": "automatic",
         "created": 1010000007,
         "currency": "usd",
@@ -486,7 +487,8 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "display_brand": "visa",
+              "exp_month": 3,
               "exp_year": 2025,
               "fingerprint": "NORMALIZED000001",
               "funding": "credit",
@@ -505,7 +507,7 @@
             },
             "created": 1010000002,
             "customer": "cus_NORMALIZED0001",
-            "id": "pm_1OhuihDEQaroqDjsNBop6Jro",
+            "id": "pm_1OqSjIDEQaroqDjsmOhve68R",
             "livemode": false,
             "metadata": {},
             "object": "payment_method",
@@ -568,7 +570,8 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "display_brand": "visa",
+          "exp_month": 3,
           "exp_year": 2025,
           "fingerprint": "NORMALIZED000001",
           "funding": "credit",
@@ -587,13 +590,13 @@
         },
         "created": 1010000002,
         "customer": "cus_NORMALIZED0001",
-        "id": "pm_1OhuihDEQaroqDjsNBop6Jro",
+        "id": "pm_1OqSjIDEQaroqDjsmOhve68R",
         "livemode": false,
         "metadata": {},
         "object": "payment_method",
         "type": "card"
       },
-      "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0002?t=1707487588",
+      "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0002?t=1709524946",
       "type": "card_error"
     }
   },
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.void_invoice.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.void_invoice.1.json
index 534b9915cd..de48ca6690 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.void_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.void_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnY2VFTFFoTGhQNUh6VUdxY0t5Y055TXptcGtGLDk4MDI4Mzky0200nqFziQA6?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NN0RNQklBaDRKblN1SGhLN0M4b1FwMmlaa1YzLDEwMDA2NTc0OA0200LEBFzxaB?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnY2VFTFFoTGhQNUh6VUdxY0t5Y055TXptcGtGLDk4MDI4Mzky0200nqFziQA6/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NN0RNQklBaDRKblN1SGhLN0M4b1FwMmlaa1YzLDEwMDA2NTc0OA0200LEBFzxaB/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.create.1.json
index 7b5f9b8af1..ac2a0e9c75 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuihDEQaroqDjsJKl4y2RJ_secret_PWyg17I3VwJpzW4FNLia039C49nUvtP",
+  "client_secret": "seti_1OqSjIDEQaroqDjsQSC6pQWt_secret_PfoM8acZjJRth6IUypuP993WHJEzRSc",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuihDEQaroqDjsJKl4y2RJ",
+  "id": "seti_1OqSjIDEQaroqDjsQSC6pQWt",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuihDEQaroqDjsANlsvVZ1",
+  "latest_attempt": "setatt_1OqSjIDEQaroqDjsVdkIIHfP",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuihDEQaroqDjsNBop6Jro",
+  "payment_method": "pm_1OqSjIDEQaroqDjsmOhve68R",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.list.1.json
index 6308c8f291..2bb924fbf0 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuigDEQaroqDjsMWE0Twiv_secret_PWyggwRTN0Ity4JnPDz4IHu2XGSJloI",
-      "created": 1010000008,
+      "client_secret": "seti_1OqSjHDEQaroqDjsRNflXydL_secret_PfoLX6wAXcbsVao6m3P8wux0Y1lWGj1",
+      "created": 1010000001,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuigDEQaroqDjsMWE0Twiv",
+      "id": "seti_1OqSjHDEQaroqDjsRNflXydL",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.retrieve.1.json
index 7b5f9b8af1..ac2a0e9c75 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuihDEQaroqDjsJKl4y2RJ_secret_PWyg17I3VwJpzW4FNLia039C49nUvtP",
+  "client_secret": "seti_1OqSjIDEQaroqDjsQSC6pQWt_secret_PfoM8acZjJRth6IUypuP993WHJEzRSc",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuihDEQaroqDjsJKl4y2RJ",
+  "id": "seti_1OqSjIDEQaroqDjsQSC6pQWt",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuihDEQaroqDjsANlsvVZ1",
+  "latest_attempt": "setatt_1OqSjIDEQaroqDjsVdkIIHfP",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuihDEQaroqDjsNBop6Jro",
+  "payment_method": "pm_1OqSjIDEQaroqDjsmOhve68R",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.create.1.json
index 33b7870273..31fa93b363 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000008,
+  "created": 1010000001,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02k97SszoFVSwqWDTxnnUw9RHbqRVuNvG5fwid81Lplwb2Y5",
+  "id": "cs_test_NORMALIZED024XDOSPWkEMwhlj4Wq55sEXiYKUEaeXOZr854PAzYwC2Vmq",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuigDEQaroqDjsMWE0Twiv",
+  "setup_intent": "seti_1OqSjHDEQaroqDjsRNflXydL",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02k97SszoFVSwqWDTxnnUw9RHbqRVuNvG5fwid81Lplwb2Y5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED024XDOSPWkEMwhlj4Wq55sEXiYKUEaeXOZr854PAzYwC2Vmq#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.list.1.json
index 7b003812fb..35d27b23b5 100644
--- a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000008,
+      "created": 1010000001,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02k97SszoFVSwqWDTxnnUw9RHbqRVuNvG5fwid81Lplwb2Y5",
+      "id": "cs_test_NORMALIZED024XDOSPWkEMwhlj4Wq55sEXiYKUEaeXOZr854PAzYwC2Vmq",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuigDEQaroqDjsMWE0Twiv",
+      "setup_intent": "seti_1OqSjHDEQaroqDjsRNflXydL",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02k97SszoFVSwqWDTxnnUw9RHbqRVuNvG5fwid81Lplwb2Y5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED024XDOSPWkEMwhlj4Wq55sEXiYKUEaeXOZr854PAzYwC2Vmq#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.create.1.json b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.create.1.json
index 31117fbaa1..c1d4990317 100644
--- a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 14400,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.finalize_invoice.1.json
index b7fad32c2a..c01d334ee1 100644
--- a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnWDRCTEpLcURBek0yQ2tFNDBnd2daN0Q4cTRILDk4MDI4Mzk10200O1amJUD5?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NcGJaS085amJrdVQwN21ocTV0aVFFeTlvZTJ6LDEwMDA2NTc1MQ0200SFYjB9Id?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnWDRCTEpLcURBek0yQ2tFNDBnd2daN0Q4cTRILDk4MDI4Mzk10200O1amJUD5/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NcGJaS085amJrdVQwN21ocTV0aVFFeTlvZTJ6LDEwMDA2NTc1MQ0200SFYjB9Id/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 14400,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.list.1.json b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.list.1.json
index c1af436751..76183523cd 100644
--- a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.list.1.json
+++ b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.list.1.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnWDRCTEpLcURBek0yQ2tFNDBnd2daN0Q4cTRILDk4MDI4Mzk20200kDeNjIVH?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NcGJaS085amJrdVQwN21ocTV0aVFFeTlvZTJ6LDEwMDA2NTc1MQ0200SFYjB9Id?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnWDRCTEpLcURBek0yQ2tFNDBnd2daN0Q4cTRILDk4MDI4Mzk20200kDeNjIVH/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NcGJaS085amJrdVQwN21ocTV0aVFFeTlvZTJ6LDEwMDA2NTc1MQ0200SFYjB9Id/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -160,7 +161,7 @@
       "total_excluding_tax": 14400,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.1.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.1.json
index dd9b0fd56f..95ad5ff56d 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuiwDEQaroqDjsvplSDUeH",
+    "default_payment_method": "pm_1OqSjVDEQaroqDjsRyjz96Px",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.2.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.2.json
index 421bd90775..624c4c6ef0 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.2.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.2.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohuj0DEQaroqDjs4MTBlptB",
+    "default_payment_method": "pm_1OqSjZDEQaroqDjsqFIff4VJ",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.3.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.3.json
index c88b572239..1c1e32b2ec 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.3.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.3.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohuj4DEQaroqDjsrj4GMZ8Q",
+    "default_payment_method": "pm_1OqSjdDEQaroqDjsKM0wMJGQ",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.4.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.4.json
index 4c8f3494ac..c4e7c2ee32 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.4.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.4.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohuj8DEQaroqDjsThdjYayj",
+    "default_payment_method": "pm_1OqSjhDEQaroqDjsj5w8kuqN",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.5.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.5.json
index d37b74b393..f9bd68b850 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.5.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.5.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhujCDEQaroqDjsJPD2ggP1",
+    "default_payment_method": "pm_1OqSjlDEQaroqDjslnrNhPkv",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.6.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.6.json
index f9b8950808..0e1df12146 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.6.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.6.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhujGDEQaroqDjsfg5UHTph",
+    "default_payment_method": "pm_1OqSjpDEQaroqDjsfA5RARkv",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.7.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.7.json
index 47265fd2ed..9423f832a9 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.7.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.7.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhujKDEQaroqDjse2jA4BOF",
+    "default_payment_method": "pm_1OqSjsDEQaroqDjs4kodvt33",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.8.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.8.json
index 2d9705f53d..9afefef5b6 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.8.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.8.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhujODEQaroqDjs1yXYzTeW",
+    "default_payment_method": "pm_1OqSjwDEQaroqDjsmYNRj5cz",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.9.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.9.json
index d576c56003..3d202ef553 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.9.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.9.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhujSDEQaroqDjsBirbVcAJ",
+    "default_payment_method": "pm_1OqSk0DEQaroqDjsOyBV2mmT",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.1.json
index d785ea6d06..22ae951381 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiwDEQaroqDjsvplSDUeH",
+      "id": "pm_1OqSjVDEQaroqDjsRyjz96Px",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.10.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.10.json
index aa3f7b5415..2d34ef22ab 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.10.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.10.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujCDEQaroqDjsJPD2ggP1",
+      "id": "pm_1OqSjlDEQaroqDjslnrNhPkv",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.11.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.11.json
index aa97516dd5..1fbcf2d676 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.11.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.11.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000004,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujGDEQaroqDjsfg5UHTph",
+      "id": "pm_1OqSjpDEQaroqDjsfA5RARkv",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.12.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.12.json
index aa97516dd5..1fbcf2d676 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.12.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.12.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000004,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujGDEQaroqDjsfg5UHTph",
+      "id": "pm_1OqSjpDEQaroqDjsfA5RARkv",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.13.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.13.json
index dd920dfbb9..ee34754b03 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.13.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.13.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000005,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujKDEQaroqDjse2jA4BOF",
+      "id": "pm_1OqSjsDEQaroqDjs4kodvt33",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.14.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.14.json
index dd920dfbb9..ee34754b03 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.14.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.14.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000005,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujKDEQaroqDjse2jA4BOF",
+      "id": "pm_1OqSjsDEQaroqDjs4kodvt33",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.15.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.15.json
index 7074cc600f..85d8987f03 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.15.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.15.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000006,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujODEQaroqDjs1yXYzTeW",
+      "id": "pm_1OqSjwDEQaroqDjsmYNRj5cz",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.16.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.16.json
index 7074cc600f..85d8987f03 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.16.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.16.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000006,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujODEQaroqDjs1yXYzTeW",
+      "id": "pm_1OqSjwDEQaroqDjsmYNRj5cz",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.17.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.17.json
index 1d3e1483c8..17223868a7 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.17.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.17.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000007,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujSDEQaroqDjsBirbVcAJ",
+      "id": "pm_1OqSk0DEQaroqDjsOyBV2mmT",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.18.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.18.json
index 1d3e1483c8..17223868a7 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.18.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.18.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000007,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujSDEQaroqDjsBirbVcAJ",
+      "id": "pm_1OqSk0DEQaroqDjsOyBV2mmT",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.2.json
index d785ea6d06..22ae951381 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiwDEQaroqDjsvplSDUeH",
+      "id": "pm_1OqSjVDEQaroqDjsRyjz96Px",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.3.json
index 9d043bd0ee..875c93b2ea 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000008,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohuj0DEQaroqDjs4MTBlptB",
+      "id": "pm_1OqSjZDEQaroqDjsqFIff4VJ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.4.json
index 9d043bd0ee..875c93b2ea 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000008,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohuj0DEQaroqDjs4MTBlptB",
+      "id": "pm_1OqSjZDEQaroqDjsqFIff4VJ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.5.json
index 335710221a..21d7ec0976 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000009,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohuj4DEQaroqDjsrj4GMZ8Q",
+      "id": "pm_1OqSjdDEQaroqDjsKM0wMJGQ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.6.json
index 335710221a..21d7ec0976 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000009,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohuj4DEQaroqDjsrj4GMZ8Q",
+      "id": "pm_1OqSjdDEQaroqDjsKM0wMJGQ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.7.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.7.json
index 49c6d333fa..11bd1f0d6a 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.7.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.7.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000010,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohuj8DEQaroqDjsThdjYayj",
+      "id": "pm_1OqSjhDEQaroqDjsj5w8kuqN",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.8.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.8.json
index 49c6d333fa..11bd1f0d6a 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.8.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.8.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000010,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohuj8DEQaroqDjsThdjYayj",
+      "id": "pm_1OqSjhDEQaroqDjsj5w8kuqN",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.9.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.9.json
index aa3f7b5415..2d34ef22ab 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.9.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.9.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujCDEQaroqDjsJPD2ggP1",
+      "id": "pm_1OqSjlDEQaroqDjslnrNhPkv",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.1.json
index 3aee0dfb9f..871fb0aef4 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuiwDEQaroqDjs4CJgCBlx_secret_PWygTuEOWZgpTufNdIkEDzJIbgNmA44",
+  "client_secret": "seti_1OqSjVDEQaroqDjsku735gJr_secret_PfoM6IShFWXMRjOl7pE0voo8KOqjmke",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuiwDEQaroqDjs4CJgCBlx",
+  "id": "seti_1OqSjVDEQaroqDjsku735gJr",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuiwDEQaroqDjsg31tbTkb",
+  "latest_attempt": "setatt_1OqSjVDEQaroqDjsK9deuhV9",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuiwDEQaroqDjsvplSDUeH",
+  "payment_method": "pm_1OqSjVDEQaroqDjsRyjz96Px",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.2.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.2.json
index 19589edcb5..814130ae51 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.2.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.2.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohuj0DEQaroqDjsLOstS2JL_secret_PWyg4lTlcwQi524121MCIImKFzhSbCf",
+  "client_secret": "seti_1OqSjZDEQaroqDjsVPaumNAj_secret_PfoMte8WGtgb8Hje4ekN8x9IpW4h13U",
   "created": 1010000008,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohuj0DEQaroqDjsLOstS2JL",
+  "id": "seti_1OqSjZDEQaroqDjsVPaumNAj",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohuj0DEQaroqDjsSna350Lb",
+  "latest_attempt": "setatt_1OqSjZDEQaroqDjs27mvL4La",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohuj0DEQaroqDjs4MTBlptB",
+  "payment_method": "pm_1OqSjZDEQaroqDjsqFIff4VJ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.3.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.3.json
index b35f03f398..2ae660a9fe 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.3.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.3.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohuj4DEQaroqDjsyHCHuw9O_secret_PWygXYBVmMa8r8GYsNugP5apikFoGRY",
+  "client_secret": "seti_1OqSjdDEQaroqDjs3VEiC11O_secret_PfoMc1GYUIuBgZCwWFxhDeoJDuxZJ5w",
   "created": 1010000009,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohuj4DEQaroqDjsyHCHuw9O",
+  "id": "seti_1OqSjdDEQaroqDjs3VEiC11O",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohuj4DEQaroqDjsbTsc9ILP",
+  "latest_attempt": "setatt_1OqSjdDEQaroqDjsKBxl3S8S",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohuj4DEQaroqDjsrj4GMZ8Q",
+  "payment_method": "pm_1OqSjdDEQaroqDjsKM0wMJGQ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.4.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.4.json
index c1e37c2f13..686a6e5fee 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.4.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.4.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohuj8DEQaroqDjszp0BPreU_secret_PWyg3vy8fqTmdNHs4BkLC3VBtP2eFbL",
+  "client_secret": "seti_1OqSjhDEQaroqDjsOpMSLACf_secret_PfoMUIoKsfHvzDvLgdjR9oDvhxRwpws",
   "created": 1010000010,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohuj8DEQaroqDjszp0BPreU",
+  "id": "seti_1OqSjhDEQaroqDjsOpMSLACf",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohuj8DEQaroqDjst5GqltIK",
+  "latest_attempt": "setatt_1OqSjhDEQaroqDjsgUU2zAE9",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohuj8DEQaroqDjsThdjYayj",
+  "payment_method": "pm_1OqSjhDEQaroqDjsj5w8kuqN",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.5.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.5.json
index 77b521d736..43d756ea2b 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.5.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.5.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujCDEQaroqDjsA6gPJ5nr_secret_PWyghwwsZ95fLZHPR5nlSVNuXmPpCrK",
+  "client_secret": "seti_1OqSjlDEQaroqDjsu20ovuK4_secret_PfoMy9Q12bPfICwCR052z9RtHSMU8vC",
   "created": 1010000003,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujCDEQaroqDjsA6gPJ5nr",
+  "id": "seti_1OqSjlDEQaroqDjsu20ovuK4",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujCDEQaroqDjsUuK5TN0f",
+  "latest_attempt": "setatt_1OqSjlDEQaroqDjsiL0cM6Ib",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujCDEQaroqDjsJPD2ggP1",
+  "payment_method": "pm_1OqSjlDEQaroqDjslnrNhPkv",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.6.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.6.json
index 198958f9ab..0b0e395c4e 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.6.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.6.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujGDEQaroqDjsG3cZzSMJ_secret_PWygcRH5GgdDrS22zMO6BGtobjbxata",
+  "client_secret": "seti_1OqSjpDEQaroqDjst0mDAXlv_secret_PfoMLgYlwvzCPCFlAG5B5YeXgwKWXGP",
   "created": 1010000004,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujGDEQaroqDjsG3cZzSMJ",
+  "id": "seti_1OqSjpDEQaroqDjst0mDAXlv",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujGDEQaroqDjsriJNaLuq",
+  "latest_attempt": "setatt_1OqSjpDEQaroqDjscsMRcx4k",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujGDEQaroqDjsfg5UHTph",
+  "payment_method": "pm_1OqSjpDEQaroqDjsfA5RARkv",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.7.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.7.json
index 6d511024be..54316b3d3c 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.7.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.7.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujKDEQaroqDjsuUIxWMdI_secret_PWygDPAGz8hu3XqKbr8ujJ0Z6RrBK0M",
+  "client_secret": "seti_1OqSjsDEQaroqDjsRyInu1ml_secret_PfoMuwQAnqbCCT3A2Yk1Xo1RLZA9TmV",
   "created": 1010000005,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujKDEQaroqDjsuUIxWMdI",
+  "id": "seti_1OqSjsDEQaroqDjsRyInu1ml",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujKDEQaroqDjshkPzvnJN",
+  "latest_attempt": "setatt_1OqSjsDEQaroqDjsWIC3tbOj",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujKDEQaroqDjse2jA4BOF",
+  "payment_method": "pm_1OqSjsDEQaroqDjs4kodvt33",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.8.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.8.json
index e16554e137..05223036da 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.8.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.8.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujODEQaroqDjsaTBzl28s_secret_PWygXX5oA1wI0wH49d8yA2KnejY38Oy",
+  "client_secret": "seti_1OqSjwDEQaroqDjsM6KNiYU4_secret_PfoMqyXxirecHV6HEcJcaitYAUveO9r",
   "created": 1010000006,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujODEQaroqDjsaTBzl28s",
+  "id": "seti_1OqSjwDEQaroqDjsM6KNiYU4",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujODEQaroqDjsrasWRi4P",
+  "latest_attempt": "setatt_1OqSjwDEQaroqDjs4es8VE47",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujODEQaroqDjs1yXYzTeW",
+  "payment_method": "pm_1OqSjwDEQaroqDjsmYNRj5cz",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.9.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.9.json
index 86c3dfcb28..32ff412f40 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.9.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.9.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujSDEQaroqDjshVUXDf3M_secret_PWygvAI4xYki9FISl5oh2VL9iYPx9gB",
+  "client_secret": "seti_1OqSk0DEQaroqDjsk2ZHlNV1_secret_PfoMy9z6kmRpL6qFyPNwfn6q7OPwOzS",
   "created": 1010000007,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujSDEQaroqDjshVUXDf3M",
+  "id": "seti_1OqSk0DEQaroqDjsk2ZHlNV1",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujSDEQaroqDjs0uc43vDG",
+  "latest_attempt": "setatt_1OqSk0DEQaroqDjscFLG7xp7",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujSDEQaroqDjsBirbVcAJ",
+  "payment_method": "pm_1OqSk0DEQaroqDjsOyBV2mmT",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.1.json
index 14abae16f0..79291d9c00 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuivDEQaroqDjs4XrFXKpT_secret_PWygA1ksUoMX87FLvUGSGhb2MNfobdA",
+      "client_secret": "seti_1OqSjUDEQaroqDjsE5ZIqH5H_secret_PfoMzksNH38KsbzXp2RfaB0UdTHolMj",
       "created": 1010000001,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuivDEQaroqDjs4XrFXKpT",
+      "id": "seti_1OqSjUDEQaroqDjsE5ZIqH5H",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.2.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.2.json
index a899083133..8be91093d6 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.2.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.2.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuizDEQaroqDjsIu7hmst3_secret_PWygK8wMAK7vNQaAt2MI4aNoG5Hyeib",
+      "client_secret": "seti_1OqSjYDEQaroqDjsiFivMiMH_secret_PfoM6xUO82nFCBfB7JTCWejqooWoV7X",
       "created": 1010000011,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuizDEQaroqDjsIu7hmst3",
+      "id": "seti_1OqSjYDEQaroqDjsiFivMiMH",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.3.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.3.json
index d3471e21c8..dc07d77cb2 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.3.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.3.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohuj3DEQaroqDjsXulNLZcW_secret_PWyg7CcLmaQCDOrJi9I33tRBhR7ZogJ",
+      "client_secret": "seti_1OqSjcDEQaroqDjs3BdLAFxe_secret_PfoMSZREUZ4gtWfwopLV5QMuq8H4DKj",
       "created": 1010000012,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohuj3DEQaroqDjsXulNLZcW",
+      "id": "seti_1OqSjcDEQaroqDjs3BdLAFxe",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.4.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.4.json
index 3c63119c3c..82f71c9669 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.4.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.4.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohuj7DEQaroqDjswuYOS8Rb_secret_PWygjs1qmVftNX49kPGwnuHAXa2W1gN",
+      "client_secret": "seti_1OqSjgDEQaroqDjsYqLzNDla_secret_PfoMvlkOYAsAsKaev7mhlwz7Pk1RcJG",
       "created": 1010000013,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohuj7DEQaroqDjswuYOS8Rb",
+      "id": "seti_1OqSjgDEQaroqDjsYqLzNDla",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.5.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.5.json
index 91c176f4ab..23092e6f14 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.5.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.5.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhujBDEQaroqDjs6YhiWFWR_secret_PWygZIWDYs9aYY5de26Hpt17nYbK7Ok",
+      "client_secret": "seti_1OqSjkDEQaroqDjszVM8NMcI_secret_PfoMnnoT9vMJuhgIrWHK0m2jOdshVTZ",
       "created": 1010000014,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhujBDEQaroqDjs6YhiWFWR",
+      "id": "seti_1OqSjkDEQaroqDjszVM8NMcI",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.6.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.6.json
index f4bcdbec08..991e98ee1f 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.6.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.6.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhujFDEQaroqDjsCwmevxdo_secret_PWyghkspChWFmpeN0Jh0CTJfbNgXQZe",
+      "client_secret": "seti_1OqSjoDEQaroqDjsphUxb3Ad_secret_PfoMD7ytF35gCLQ8kifPJDnlQEzMk92",
       "created": 1010000015,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhujFDEQaroqDjsCwmevxdo",
+      "id": "seti_1OqSjoDEQaroqDjsphUxb3Ad",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.7.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.7.json
index e109164846..06aaa07850 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.7.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.7.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhujJDEQaroqDjsT6OuISG6_secret_PWygGp6qEg0h9zeaRGclsX0EMXvrav7",
-      "created": 1010000016,
+      "client_secret": "seti_1OqSjsDEQaroqDjsupXJFANK_secret_PfoMo4NUtrvO7958nIBOt9CGsB5QAst",
+      "created": 1010000005,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhujJDEQaroqDjsT6OuISG6",
+      "id": "seti_1OqSjsDEQaroqDjsupXJFANK",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.8.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.8.json
index 3c9161edcc..3d2b431f55 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.8.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.8.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhujNDEQaroqDjsR4dvwsS2_secret_PWygdKoXqEknN9v8umP6J3jwwOpL6To",
-      "created": 1010000017,
+      "client_secret": "seti_1OqSjvDEQaroqDjsNmc7QIpc_secret_PfoMhVHP6zDvNzyJk8tRA9fxi8eRaFj",
+      "created": 1010000016,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhujNDEQaroqDjsR4dvwsS2",
+      "id": "seti_1OqSjvDEQaroqDjsNmc7QIpc",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.9.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.9.json
index 4a2b3cea7f..f5d23d5727 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.9.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.9.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhujRDEQaroqDjss2So1c4a_secret_PWyg5RlkpuyGF9kjXL5jUeWiX5tGN6b",
-      "created": 1010000018,
+      "client_secret": "seti_1OqSjzDEQaroqDjsHflK0yqS_secret_PfoMMISCdlsLo8N4WMpKP8qsOfcIdJu",
+      "created": 1010000017,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhujRDEQaroqDjss2So1c4a",
+      "id": "seti_1OqSjzDEQaroqDjsHflK0yqS",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.1.json
index 3aee0dfb9f..871fb0aef4 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuiwDEQaroqDjs4CJgCBlx_secret_PWygTuEOWZgpTufNdIkEDzJIbgNmA44",
+  "client_secret": "seti_1OqSjVDEQaroqDjsku735gJr_secret_PfoM6IShFWXMRjOl7pE0voo8KOqjmke",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuiwDEQaroqDjs4CJgCBlx",
+  "id": "seti_1OqSjVDEQaroqDjsku735gJr",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuiwDEQaroqDjsg31tbTkb",
+  "latest_attempt": "setatt_1OqSjVDEQaroqDjsK9deuhV9",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuiwDEQaroqDjsvplSDUeH",
+  "payment_method": "pm_1OqSjVDEQaroqDjsRyjz96Px",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.2.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.2.json
index 19589edcb5..814130ae51 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.2.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohuj0DEQaroqDjsLOstS2JL_secret_PWyg4lTlcwQi524121MCIImKFzhSbCf",
+  "client_secret": "seti_1OqSjZDEQaroqDjsVPaumNAj_secret_PfoMte8WGtgb8Hje4ekN8x9IpW4h13U",
   "created": 1010000008,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohuj0DEQaroqDjsLOstS2JL",
+  "id": "seti_1OqSjZDEQaroqDjsVPaumNAj",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohuj0DEQaroqDjsSna350Lb",
+  "latest_attempt": "setatt_1OqSjZDEQaroqDjs27mvL4La",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohuj0DEQaroqDjs4MTBlptB",
+  "payment_method": "pm_1OqSjZDEQaroqDjsqFIff4VJ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.3.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.3.json
index b35f03f398..2ae660a9fe 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.3.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohuj4DEQaroqDjsyHCHuw9O_secret_PWygXYBVmMa8r8GYsNugP5apikFoGRY",
+  "client_secret": "seti_1OqSjdDEQaroqDjs3VEiC11O_secret_PfoMc1GYUIuBgZCwWFxhDeoJDuxZJ5w",
   "created": 1010000009,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohuj4DEQaroqDjsyHCHuw9O",
+  "id": "seti_1OqSjdDEQaroqDjs3VEiC11O",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohuj4DEQaroqDjsbTsc9ILP",
+  "latest_attempt": "setatt_1OqSjdDEQaroqDjsKBxl3S8S",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohuj4DEQaroqDjsrj4GMZ8Q",
+  "payment_method": "pm_1OqSjdDEQaroqDjsKM0wMJGQ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.4.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.4.json
index c1e37c2f13..686a6e5fee 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.4.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohuj8DEQaroqDjszp0BPreU_secret_PWyg3vy8fqTmdNHs4BkLC3VBtP2eFbL",
+  "client_secret": "seti_1OqSjhDEQaroqDjsOpMSLACf_secret_PfoMUIoKsfHvzDvLgdjR9oDvhxRwpws",
   "created": 1010000010,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohuj8DEQaroqDjszp0BPreU",
+  "id": "seti_1OqSjhDEQaroqDjsOpMSLACf",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohuj8DEQaroqDjst5GqltIK",
+  "latest_attempt": "setatt_1OqSjhDEQaroqDjsgUU2zAE9",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohuj8DEQaroqDjsThdjYayj",
+  "payment_method": "pm_1OqSjhDEQaroqDjsj5w8kuqN",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.5.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.5.json
index 77b521d736..43d756ea2b 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.5.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujCDEQaroqDjsA6gPJ5nr_secret_PWyghwwsZ95fLZHPR5nlSVNuXmPpCrK",
+  "client_secret": "seti_1OqSjlDEQaroqDjsu20ovuK4_secret_PfoMy9Q12bPfICwCR052z9RtHSMU8vC",
   "created": 1010000003,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujCDEQaroqDjsA6gPJ5nr",
+  "id": "seti_1OqSjlDEQaroqDjsu20ovuK4",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujCDEQaroqDjsUuK5TN0f",
+  "latest_attempt": "setatt_1OqSjlDEQaroqDjsiL0cM6Ib",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujCDEQaroqDjsJPD2ggP1",
+  "payment_method": "pm_1OqSjlDEQaroqDjslnrNhPkv",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.6.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.6.json
index 198958f9ab..0b0e395c4e 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.6.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujGDEQaroqDjsG3cZzSMJ_secret_PWygcRH5GgdDrS22zMO6BGtobjbxata",
+  "client_secret": "seti_1OqSjpDEQaroqDjst0mDAXlv_secret_PfoMLgYlwvzCPCFlAG5B5YeXgwKWXGP",
   "created": 1010000004,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujGDEQaroqDjsG3cZzSMJ",
+  "id": "seti_1OqSjpDEQaroqDjst0mDAXlv",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujGDEQaroqDjsriJNaLuq",
+  "latest_attempt": "setatt_1OqSjpDEQaroqDjscsMRcx4k",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujGDEQaroqDjsfg5UHTph",
+  "payment_method": "pm_1OqSjpDEQaroqDjsfA5RARkv",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.7.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.7.json
index 6d511024be..54316b3d3c 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.7.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.7.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujKDEQaroqDjsuUIxWMdI_secret_PWygDPAGz8hu3XqKbr8ujJ0Z6RrBK0M",
+  "client_secret": "seti_1OqSjsDEQaroqDjsRyInu1ml_secret_PfoMuwQAnqbCCT3A2Yk1Xo1RLZA9TmV",
   "created": 1010000005,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujKDEQaroqDjsuUIxWMdI",
+  "id": "seti_1OqSjsDEQaroqDjsRyInu1ml",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujKDEQaroqDjshkPzvnJN",
+  "latest_attempt": "setatt_1OqSjsDEQaroqDjsWIC3tbOj",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujKDEQaroqDjse2jA4BOF",
+  "payment_method": "pm_1OqSjsDEQaroqDjs4kodvt33",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.8.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.8.json
index e16554e137..05223036da 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.8.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.8.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujODEQaroqDjsaTBzl28s_secret_PWygXX5oA1wI0wH49d8yA2KnejY38Oy",
+  "client_secret": "seti_1OqSjwDEQaroqDjsM6KNiYU4_secret_PfoMqyXxirecHV6HEcJcaitYAUveO9r",
   "created": 1010000006,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujODEQaroqDjsaTBzl28s",
+  "id": "seti_1OqSjwDEQaroqDjsM6KNiYU4",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujODEQaroqDjsrasWRi4P",
+  "latest_attempt": "setatt_1OqSjwDEQaroqDjs4es8VE47",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujODEQaroqDjs1yXYzTeW",
+  "payment_method": "pm_1OqSjwDEQaroqDjsmYNRj5cz",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.9.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.9.json
index 86c3dfcb28..32ff412f40 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.9.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.9.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujSDEQaroqDjshVUXDf3M_secret_PWygvAI4xYki9FISl5oh2VL9iYPx9gB",
+  "client_secret": "seti_1OqSk0DEQaroqDjsk2ZHlNV1_secret_PfoMy9z6kmRpL6qFyPNwfn6q7OPwOzS",
   "created": 1010000007,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujSDEQaroqDjshVUXDf3M",
+  "id": "seti_1OqSk0DEQaroqDjsk2ZHlNV1",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujSDEQaroqDjs0uc43vDG",
+  "latest_attempt": "setatt_1OqSk0DEQaroqDjscFLG7xp7",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujSDEQaroqDjsBirbVcAJ",
+  "payment_method": "pm_1OqSk0DEQaroqDjsOyBV2mmT",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.1.json
index 80755ca357..bd22f9560f 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01flvikmtSjHsO3XzluVfSiXbPx93IviZ31dBgQFoRTOaWxV",
+  "id": "cs_test_NORMALIZED01jhwJr9JdtxJ8hJauEI5GLCrOtLOmfnvrNyX6dMt6Q8XcAM",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuivDEQaroqDjs4XrFXKpT",
+  "setup_intent": "seti_1OqSjUDEQaroqDjsE5ZIqH5H",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01flvikmtSjHsO3XzluVfSiXbPx93IviZ31dBgQFoRTOaWxV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01jhwJr9JdtxJ8hJauEI5GLCrOtLOmfnvrNyX6dMt6Q8XcAM#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.2.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.2.json
index 7fc0c958fd..5c66bb9691 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.2.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.2.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02lyPuMuPqqx0IVXEFbtMJUp5Pl2djAkMUwqaLMupVPphM4a",
+  "id": "cs_test_NORMALIZED02rRcg387yeEdqyAZckp9QWJhOMsjfxOlSK0U6BMDMyXYVkj",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuizDEQaroqDjsIu7hmst3",
+  "setup_intent": "seti_1OqSjYDEQaroqDjsiFivMiMH",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02lyPuMuPqqx0IVXEFbtMJUp5Pl2djAkMUwqaLMupVPphM4a#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02rRcg387yeEdqyAZckp9QWJhOMsjfxOlSK0U6BMDMyXYVkj#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.3.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.3.json
index c0a86e90b0..33aa1ebaee 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.3.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.3.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED03KnvvFgAIHfxThFImnCf4pvHE5ZMJkpOirUWIfgbkUiBMe0",
+  "id": "cs_test_NORMALIZED03ZnU5pZgvjUAugHx79GKMuBwp0JtpEI4nvygnaW5AYMqcal",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohuj3DEQaroqDjsXulNLZcW",
+  "setup_intent": "seti_1OqSjcDEQaroqDjs3BdLAFxe",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03KnvvFgAIHfxThFImnCf4pvHE5ZMJkpOirUWIfgbkUiBMe0#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03ZnU5pZgvjUAugHx79GKMuBwp0JtpEI4nvygnaW5AYMqcal#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.4.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.4.json
index 118c9561d4..e8ff4bbbc6 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.4.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.4.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED04R0xHmCBPpaSE3pzlgInT0X1tL97nr7vissUEIjJsdk2Tte",
+  "id": "cs_test_NORMALIZED04h9U2pl9ZfmuNc4XqLt7wIzKVcUmPa0to5oTLe6lmc4u4wR",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohuj7DEQaroqDjswuYOS8Rb",
+  "setup_intent": "seti_1OqSjgDEQaroqDjsYqLzNDla",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04R0xHmCBPpaSE3pzlgInT0X1tL97nr7vissUEIjJsdk2Tte#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04h9U2pl9ZfmuNc4XqLt7wIzKVcUmPa0to5oTLe6lmc4u4wR#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.5.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.5.json
index c9f6319d4a..bc95c723d7 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.5.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.5.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED05Cnj6pjhdGglc42yAhepvSEkQa1cJYwgkLOwtsHWkcWKD2R",
+  "id": "cs_test_NORMALIZED05i5660mFtYcDakKpI0gd8KzVh9gSoBQnij3k5WyyyEsgXLH",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhujBDEQaroqDjs6YhiWFWR",
+  "setup_intent": "seti_1OqSjkDEQaroqDjszVM8NMcI",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05Cnj6pjhdGglc42yAhepvSEkQa1cJYwgkLOwtsHWkcWKD2R#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05i5660mFtYcDakKpI0gd8KzVh9gSoBQnij3k5WyyyEsgXLH#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.6.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.6.json
index e73876187a..d75e2af3a0 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.6.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.6.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED069r7WkQDgffRQLAJdcCZJDUKHh4RZXZX6AiPoi9fxOAJziV",
+  "id": "cs_test_NORMALIZED06OmZknXSR8Mexa9CcBD15xEyqwJzTy3PEOP0wIUytTDsw6Y",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhujFDEQaroqDjsCwmevxdo",
+  "setup_intent": "seti_1OqSjoDEQaroqDjsphUxb3Ad",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED069r7WkQDgffRQLAJdcCZJDUKHh4RZXZX6AiPoi9fxOAJziV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED06OmZknXSR8Mexa9CcBD15xEyqwJzTy3PEOP0wIUytTDsw6Y#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.7.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.7.json
index 6dbb7a7ae1..4c7aa7a192 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.7.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.7.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000016,
+  "created": 1010000005,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED07ZsP3wN3wL7o99Et65PFjv7iLwBRN1RqxOW9MiLdQQepnWy",
+  "id": "cs_test_NORMALIZED07pI7IHqBFkQW9mwjsOuh6MMJ72G7235gZkl1W2g16G6pCkC",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhujJDEQaroqDjsT6OuISG6",
+  "setup_intent": "seti_1OqSjsDEQaroqDjsupXJFANK",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED07ZsP3wN3wL7o99Et65PFjv7iLwBRN1RqxOW9MiLdQQepnWy#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED07pI7IHqBFkQW9mwjsOuh6MMJ72G7235gZkl1W2g16G6pCkC#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.8.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.8.json
index f8a2c44c72..903a2cc225 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.8.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.8.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000017,
+  "created": 1010000016,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED08MPsPEIToX1qIHqsfK4JuhYkXqz2UgJKcNshepIN9iOslbs",
+  "id": "cs_test_NORMALIZED08FDc0iCgIetIBIcmOmJnEUX85YMlFEdVWgIcR87O0kmJrEw",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhujNDEQaroqDjsR4dvwsS2",
+  "setup_intent": "seti_1OqSjvDEQaroqDjsNmc7QIpc",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED08MPsPEIToX1qIHqsfK4JuhYkXqz2UgJKcNshepIN9iOslbs#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED08FDc0iCgIetIBIcmOmJnEUX85YMlFEdVWgIcR87O0kmJrEw#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.9.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.9.json
index fa4d025b2d..a5166d7a9f 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.9.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.9.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000018,
+  "created": 1010000017,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED09xOB1rlTgJ9Yr25HpfHqfaRBicVPxRoyVmZcm6jdH5EF4vE",
+  "id": "cs_test_NORMALIZED09LAl75il5IzsqujATAQlxTQOL9YBV8qUu6Qo0wUhWpi9HLj",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhujRDEQaroqDjss2So1c4a",
+  "setup_intent": "seti_1OqSjzDEQaroqDjsHflK0yqS",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED09xOB1rlTgJ9Yr25HpfHqfaRBicVPxRoyVmZcm6jdH5EF4vE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED09LAl75il5IzsqujATAQlxTQOL9YBV8qUu6Qo0wUhWpi9HLj#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.1.json
index cd8a34a894..45cf61006c 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01flvikmtSjHsO3XzluVfSiXbPx93IviZ31dBgQFoRTOaWxV",
+      "id": "cs_test_NORMALIZED01jhwJr9JdtxJ8hJauEI5GLCrOtLOmfnvrNyX6dMt6Q8XcAM",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuivDEQaroqDjs4XrFXKpT",
+      "setup_intent": "seti_1OqSjUDEQaroqDjsE5ZIqH5H",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01flvikmtSjHsO3XzluVfSiXbPx93IviZ31dBgQFoRTOaWxV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01jhwJr9JdtxJ8hJauEI5GLCrOtLOmfnvrNyX6dMt6Q8XcAM#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.2.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.2.json
index 79120a26fb..f7d97b0fb2 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.2.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.2.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02lyPuMuPqqx0IVXEFbtMJUp5Pl2djAkMUwqaLMupVPphM4a",
+      "id": "cs_test_NORMALIZED02rRcg387yeEdqyAZckp9QWJhOMsjfxOlSK0U6BMDMyXYVkj",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuizDEQaroqDjsIu7hmst3",
+      "setup_intent": "seti_1OqSjYDEQaroqDjsiFivMiMH",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02lyPuMuPqqx0IVXEFbtMJUp5Pl2djAkMUwqaLMupVPphM4a#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02rRcg387yeEdqyAZckp9QWJhOMsjfxOlSK0U6BMDMyXYVkj#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.3.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.3.json
index a7dae7536d..103cbf7a0b 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.3.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.3.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED03KnvvFgAIHfxThFImnCf4pvHE5ZMJkpOirUWIfgbkUiBMe0",
+      "id": "cs_test_NORMALIZED03ZnU5pZgvjUAugHx79GKMuBwp0JtpEI4nvygnaW5AYMqcal",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohuj3DEQaroqDjsXulNLZcW",
+      "setup_intent": "seti_1OqSjcDEQaroqDjs3BdLAFxe",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03KnvvFgAIHfxThFImnCf4pvHE5ZMJkpOirUWIfgbkUiBMe0#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03ZnU5pZgvjUAugHx79GKMuBwp0JtpEI4nvygnaW5AYMqcal#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.4.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.4.json
index 00db4d40ab..0f735c5fb3 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.4.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.4.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED04R0xHmCBPpaSE3pzlgInT0X1tL97nr7vissUEIjJsdk2Tte",
+      "id": "cs_test_NORMALIZED04h9U2pl9ZfmuNc4XqLt7wIzKVcUmPa0to5oTLe6lmc4u4wR",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohuj7DEQaroqDjswuYOS8Rb",
+      "setup_intent": "seti_1OqSjgDEQaroqDjsYqLzNDla",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04R0xHmCBPpaSE3pzlgInT0X1tL97nr7vissUEIjJsdk2Tte#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04h9U2pl9ZfmuNc4XqLt7wIzKVcUmPa0to5oTLe6lmc4u4wR#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.5.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.5.json
index cfe0f20815..cc28224562 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.5.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.5.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED05Cnj6pjhdGglc42yAhepvSEkQa1cJYwgkLOwtsHWkcWKD2R",
+      "id": "cs_test_NORMALIZED05i5660mFtYcDakKpI0gd8KzVh9gSoBQnij3k5WyyyEsgXLH",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhujBDEQaroqDjs6YhiWFWR",
+      "setup_intent": "seti_1OqSjkDEQaroqDjszVM8NMcI",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05Cnj6pjhdGglc42yAhepvSEkQa1cJYwgkLOwtsHWkcWKD2R#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05i5660mFtYcDakKpI0gd8KzVh9gSoBQnij3k5WyyyEsgXLH#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.6.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.6.json
index c6ecf57016..566b198008 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.6.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.6.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED069r7WkQDgffRQLAJdcCZJDUKHh4RZXZX6AiPoi9fxOAJziV",
+      "id": "cs_test_NORMALIZED06OmZknXSR8Mexa9CcBD15xEyqwJzTy3PEOP0wIUytTDsw6Y",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhujFDEQaroqDjsCwmevxdo",
+      "setup_intent": "seti_1OqSjoDEQaroqDjsphUxb3Ad",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED069r7WkQDgffRQLAJdcCZJDUKHh4RZXZX6AiPoi9fxOAJziV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED06OmZknXSR8Mexa9CcBD15xEyqwJzTy3PEOP0wIUytTDsw6Y#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.7.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.7.json
index 4744c20eeb..0440dde007 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.7.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.7.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000016,
+      "created": 1010000005,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED07ZsP3wN3wL7o99Et65PFjv7iLwBRN1RqxOW9MiLdQQepnWy",
+      "id": "cs_test_NORMALIZED07pI7IHqBFkQW9mwjsOuh6MMJ72G7235gZkl1W2g16G6pCkC",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhujJDEQaroqDjsT6OuISG6",
+      "setup_intent": "seti_1OqSjsDEQaroqDjsupXJFANK",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED07ZsP3wN3wL7o99Et65PFjv7iLwBRN1RqxOW9MiLdQQepnWy#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED07pI7IHqBFkQW9mwjsOuh6MMJ72G7235gZkl1W2g16G6pCkC#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.8.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.8.json
index 0edf5aae0d..f7566c8f59 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.8.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.8.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000017,
+      "created": 1010000016,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED08MPsPEIToX1qIHqsfK4JuhYkXqz2UgJKcNshepIN9iOslbs",
+      "id": "cs_test_NORMALIZED08FDc0iCgIetIBIcmOmJnEUX85YMlFEdVWgIcR87O0kmJrEw",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhujNDEQaroqDjsR4dvwsS2",
+      "setup_intent": "seti_1OqSjvDEQaroqDjsNmc7QIpc",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED08MPsPEIToX1qIHqsfK4JuhYkXqz2UgJKcNshepIN9iOslbs#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED08FDc0iCgIetIBIcmOmJnEUX85YMlFEdVWgIcR87O0kmJrEw#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.9.json b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.9.json
index 8ba6f825d2..0424900cb0 100644
--- a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.9.json
+++ b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.9.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000018,
+      "created": 1010000017,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED09xOB1rlTgJ9Yr25HpfHqfaRBicVPxRoyVmZcm6jdH5EF4vE",
+      "id": "cs_test_NORMALIZED09LAl75il5IzsqujATAQlxTQOL9YBV8qUu6Qo0wUhWpi9HLj",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhujRDEQaroqDjss2So1c4a",
+      "setup_intent": "seti_1OqSjzDEQaroqDjsHflK0yqS",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED09xOB1rlTgJ9Yr25HpfHqfaRBicVPxRoyVmZcm6jdH5EF4vE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED09LAl75il5IzsqujATAQlxTQOL9YBV8qUu6Qo0wUhWpi9HLj#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.modify.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.modify.1.json
index c11351a05b..77fed5a027 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+    "default_payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.2.json
index edd476869b..4feba5c702 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+      "id": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.3.json
index edd476869b..4feba5c702 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+      "id": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.4.json
index edd476869b..4feba5c702 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+      "id": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.5.json
index edd476869b..4feba5c702 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+      "id": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.6.json
index da750618c4..0dbe0a929f 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+      "id": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.1.json
index 95323b4b59..10f103f9fe 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+            "default_payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhujZDEQaroqDjs7Xf9Elga",
+      "id": "evt_1OqSk7DEQaroqDjs4tFYabaf",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "c4525dca-23e1-4ce2-8833-992e08400bf6"
+        "idempotency_key": "24750212-7ec3-46b3-a6e1-7e88be1e3ecd"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.2.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.2.json
index d08d7253d0..3d5f1fb9d5 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+                "payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "iago@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJrjmK4GMgb_sAFWka06LBauMMe5AJnKLwS4JwroSX_R1dhQsm0elc2PMbl00S6edQRLVTkZ08sMj2MJ?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKISQla8GMgZ4ssPWHfU6LBbLS9VOwmvNq-CqH_y7KmxLxqGuEPJTyaKc7YyFlq4KGtB5gZ2dDgFO1Tcs?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_zhzzTdCnIkgX6Sf1pttSEYGyE",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_oRvEDaL5dULakrouTjFfAh55E",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+          "payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhujcDEQaroqDjs1JTcUQ1n",
+      "id": "evt_3OqSkADEQaroqDjs12SCMTGN",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "cb586b70-a3f3-4bcc-b045-bc2ee9f7e9fa"
+        "idempotency_key": "443bb77b-d75b-4ad1-97f0-9bf7a9c5d941"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+          "payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
           "payment_method_details": {
             "card": {
               "amount_authorized": 48000,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "iago@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJrjmK4GMga5XWhGZIY6LBbGqqeejp0VsWmhy5LgwjJSnw7EdW1MF7OssI0Zr0cQguz9RPr2sSjPb3rq?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKISQla8GMgb0XcwWJLc6LBYV-WBOSFSoM4zwcoQXE4PT7EKNo8nT_o13kgHTnRSvNQWPossr-w80Ibok?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhujcDEQaroqDjs1GK1gfti",
+      "id": "evt_3OqSkADEQaroqDjs127XiBuk",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "cb586b70-a3f3-4bcc-b045-bc2ee9f7e9fa"
+        "idempotency_key": "443bb77b-d75b-4ad1-97f0-9bf7a9c5d941"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQw0200A6gwwEoA?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5NQ0200SJ43wSPh?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQw0200A6gwwEoA/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5NQ0200SJ43wSPh/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -489,16 +490,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhujdDEQaroqDjsgNMzj3Um",
+      "id": "evt_1OqSkBDEQaroqDjsahVoHaeI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "b5fb8cff-fcc3-45f6-845f-4245e8cedfcb"
+        "idempotency_key": "a98a91e7-d1f2-443c-865c-027d3e1a0b4c"
       },
       "type": "invoice.finalized"
     },
@@ -549,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQw0200A6gwwEoA?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5NQ0200SJ43wSPh?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQw0200A6gwwEoA/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5NQ0200SJ43wSPh/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -568,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -672,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -692,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhujcDEQaroqDjshNGfkFAI",
+      "id": "evt_1OqSkBDEQaroqDjsyJkSh6Mf",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "b5fb8cff-fcc3-45f6-845f-4245e8cedfcb"
+        "idempotency_key": "a98a91e7-d1f2-443c-865c-027d3e1a0b4c"
       },
       "type": "invoice.updated"
     },
@@ -726,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_zhzzTdCnIkgX6Sf1pttSEYGyE",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_oRvEDaL5dULakrouTjFfAh55E",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -769,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhujcDEQaroqDjs1F9k5GoT",
+      "id": "evt_3OqSkADEQaroqDjs1BHRFY9f",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "b5fb8cff-fcc3-45f6-845f-4245e8cedfcb"
+        "idempotency_key": "a98a91e7-d1f2-443c-865c-027d3e1a0b4c"
       },
       "type": "payment_intent.created"
     },
@@ -845,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -949,16 +952,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhujbDEQaroqDjsrpof3Yzi",
+      "id": "evt_1OqSkADEQaroqDjsAt7hxSOB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "3d3962ed-e962-41e1-ab57-7fe5880314c9"
+        "idempotency_key": "69cd9eda-5c69-4980-b132-a429b134f99f"
       },
       "type": "invoice.created"
     },
@@ -1014,13 +1017,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhujbDEQaroqDjsxRUn6WnG",
+      "id": "evt_1OqSk9DEQaroqDjsc0B0tZv7",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "9b8ff291-88ff-48b1-b60b-24bb5e60ca9c"
+        "idempotency_key": "bf99e740-3646-43de-9c7a-794b9967f2dc"
       },
       "type": "invoiceitem.created"
     },
@@ -1043,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+            "default_payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
             "footer": null,
             "rendering_options": null
           },
@@ -1066,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhujbDEQaroqDjsVZ2JANKR",
+      "id": "evt_1OqSk9DEQaroqDjsv7ekhGjD",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "9b8ff291-88ff-48b1-b60b-24bb5e60ca9c"
+        "idempotency_key": "bf99e740-3646-43de-9c7a-794b9967f2dc"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.3.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.3.json
index b100206592..fcbd37d818 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQz0200gzjlr0Hr?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Nw0200ULZypQB2?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQz0200gzjlr0Hr/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Nw0200ULZypQB2/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhujfDEQaroqDjsz3nYqViV",
+      "id": "evt_1OqSkDDEQaroqDjs0K5GnNtK",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "cb586b70-a3f3-4bcc-b045-bc2ee9f7e9fa"
+        "idempotency_key": "443bb77b-d75b-4ad1-97f0-9bf7a9c5d941"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQz0200gzjlr0Hr?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Nw0200ULZypQB2?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQz0200gzjlr0Hr/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Nw0200ULZypQB2/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +250,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -356,13 +358,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhujfDEQaroqDjsTp3IGTCl",
+      "id": "evt_1OqSkDDEQaroqDjscyRZw3ve",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "cb586b70-a3f3-4bcc-b045-bc2ee9f7e9fa"
+        "idempotency_key": "443bb77b-d75b-4ad1-97f0-9bf7a9c5d941"
       },
       "type": "invoice.paid"
     },
@@ -413,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQy0200pwccTkw7?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Nw0200ULZypQB2?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQy0200pwccTkw7/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Nw0200ULZypQB2/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -432,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -551,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhujeDEQaroqDjswFXk4Nnb",
+      "id": "evt_1OqSkDDEQaroqDjskl1wZnlR",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "cb586b70-a3f3-4bcc-b045-bc2ee9f7e9fa"
+        "idempotency_key": "443bb77b-d75b-4ad1-97f0-9bf7a9c5d941"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.create.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.create.1.json
index 3e9fcb203e..be7029d609 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.finalize_invoice.1.json
index 48d19e9721..f6e2a0cb18 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQw0200A6gwwEoA?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5NQ0200SJ43wSPh?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQw0200A6gwwEoA/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5NQ0200SJ43wSPh/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.pay.1.json
index 1066bcac95..5787570446 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQy0200pwccTkw7?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Ng0200JmdWUpmf?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lnVjRGQlRzWklQU0l1TGhORlRHNjc2eTIyZllQLDk4MDI4NDQy0200pwccTkw7/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9NQ3RrSmRMQWxUTjhnRlRscjdvMENqSFBZYWxOLDEwMDA2NTc5Ng0200JmdWUpmf/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.create.1.json
index bb1623d33b..4fefdc3632 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujXDEQaroqDjsC19OcUAU_secret_PWygs5nKz2cJVltvHoDmKGuPLtx8aG5",
+  "client_secret": "seti_1OqSk5DEQaroqDjszbJbY9iB_secret_PfoMCOHsFhiijXvw5BI9Nks1eNDjYB5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujXDEQaroqDjsC19OcUAU",
+  "id": "seti_1OqSk5DEQaroqDjszbJbY9iB",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujXDEQaroqDjsCoxa6Rhk",
+  "latest_attempt": "setatt_1OqSk5DEQaroqDjsU1i7UdQR",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+  "payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.list.1.json
index 56e95e23e5..497fc84892 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhujWDEQaroqDjsiFILJQFR_secret_PWygKHsRhETV8Arp1qYAJTq2gxKNVW7",
+      "client_secret": "seti_1OqSk4DEQaroqDjsHIfTDz2I_secret_PfoMOoc0FbgXU9jKCShFlaHSzBbYeHe",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhujWDEQaroqDjsiFILJQFR",
+      "id": "seti_1OqSk4DEQaroqDjsHIfTDz2I",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.retrieve.1.json
index bb1623d33b..4fefdc3632 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhujXDEQaroqDjsC19OcUAU_secret_PWygs5nKz2cJVltvHoDmKGuPLtx8aG5",
+  "client_secret": "seti_1OqSk5DEQaroqDjszbJbY9iB_secret_PfoMCOHsFhiijXvw5BI9Nks1eNDjYB5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhujXDEQaroqDjsC19OcUAU",
+  "id": "seti_1OqSk5DEQaroqDjszbJbY9iB",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhujXDEQaroqDjsCoxa6Rhk",
+  "latest_attempt": "setatt_1OqSk5DEQaroqDjsU1i7UdQR",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhujXDEQaroqDjsWcRSpfg0",
+  "payment_method": "pm_1OqSk5DEQaroqDjsFn24Hxpe",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.create.1.json
index 606959b0e9..f9b388bc3f 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02DEhbXjCU8F1LXHrG5F8H3KCZ8Thy5hXAnmrPxElrUlIJcJ",
+  "id": "cs_test_NORMALIZED02svXP1s81LPUnmYqspwWA98NLzFEdu3Rlxg9fG1GSPVhaPU",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhujWDEQaroqDjsiFILJQFR",
+  "setup_intent": "seti_1OqSk4DEQaroqDjsHIfTDz2I",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02DEhbXjCU8F1LXHrG5F8H3KCZ8Thy5hXAnmrPxElrUlIJcJ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02svXP1s81LPUnmYqspwWA98NLzFEdu3Rlxg9fG1GSPVhaPU#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.list.1.json
index ee4141431d..2afc2cab8c 100644
--- a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02DEhbXjCU8F1LXHrG5F8H3KCZ8Thy5hXAnmrPxElrUlIJcJ",
+      "id": "cs_test_NORMALIZED02svXP1s81LPUnmYqspwWA98NLzFEdu3Rlxg9fG1GSPVhaPU",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhujWDEQaroqDjsiFILJQFR",
+      "setup_intent": "seti_1OqSk4DEQaroqDjsHIfTDz2I",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02DEhbXjCU8F1LXHrG5F8H3KCZ8Thy5hXAnmrPxElrUlIJcJ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02svXP1s81LPUnmYqspwWA98NLzFEdu3Rlxg9fG1GSPVhaPU#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Customer.retrieve.1.json
new file mode 100644
index 0000000000..593a07ed0c
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Customer.retrieve.1.json
@@ -0,0 +1,33 @@
+{
+  "address": null,
+  "balance": 0,
+  "created": 1000000000,
+  "currency": null,
+  "default_currency": null,
+  "default_source": null,
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
+  "invoice_settings": {
+    "custom_fields": null,
+    "default_payment_method": null,
+    "footer": null,
+    "rendering_options": null
+  },
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "name": null,
+  "next_invoice_sequence": 1,
+  "object": "customer",
+  "phone": null,
+  "preferred_locales": [],
+  "shipping": null,
+  "tax_exempt": "none",
+  "test_clock": null
+}
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.1.json
index 242ca4c06c..c135b76b38 100644
--- a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.1.json
@@ -5,177 +5,48 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 24000,
-          "amount_paid": 0,
-          "amount_remaining": 24000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": true,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
+          "address": null,
+          "balance": 0,
           "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0002",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
+          "currency": null,
+          "default_currency": null,
           "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
           "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxNkg1M3Z6Q3hoVEpiYU9Nd2lVNW84NzBzVExVLDk4MDI5MDEz0200zw7aOJj1?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxNkg1M3Z6Q3hoVEpiYU9Nd2lVNW84NzBzVExVLDk4MDI5MDEz0200zw7aOJj1/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 24000,
-                "amount_excluding_tax": 24000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard - renewal",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1388631845,
-                  "start": 1357095845
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 4000,
-                  "unit_amount_decimal": "4000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "4000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0002",
+          "invoice_prefix": "NORMA02",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
           },
           "livemode": false,
-          "metadata": {},
-          "next_payment_attempt": 1000000000,
-          "number": "NORMALI-0001",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
           },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 24000,
-          "subtotal_excluding_tax": 24000,
-          "tax": null,
-          "test_clock": null,
-          "total": 24000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 24000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
         }
       },
-      "id": "evt_1OhusrDEQaroqDjsYOE9bgON",
+      "id": "evt_1OqUpaDEQaroqDjsJhakIUDE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "787650d7-a0af-48ca-8e00-93770dff1dbe"
+        "idempotency_key": "d323e362-e463-4a2d-8895-0232ca6f9529"
       },
-      "type": "invoice.finalized"
+      "type": "customer.created"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.2.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.2.json
new file mode 100644
index 0000000000..e634ccb1c5
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.2.json
@@ -0,0 +1,1014 @@
+{
+  "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": 1000000000,
+          "cancellation_reason": "requested_by_customer",
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+          },
+          "client_secret": "pi_NORMALIZED00000000000001_secret_DqmcHawyi3fS7jmoFw8fNlu8s",
+          "confirmation_method": "automatic",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
+          },
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "canceled",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqUsaDEQaroqDjs1BLAPSdB",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "20fe148d-1a57-4cb7-9f48-e7b1209834be"
+      },
+      "type": "payment_intent.canceled"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "ach_credit_transfer": {
+            "account_number": "test_NORMALIZED01",
+            "bank_name": "TEST BANK",
+            "fingerprint": "NORMALIZED000001",
+            "refund_account_holder_name": null,
+            "refund_account_holder_type": null,
+            "refund_routing_number": null,
+            "routing_number": "110000000",
+            "swift_code": "TSTEZ122"
+          },
+          "amount": null,
+          "client_secret": "src_client_secret_NORMALIZED00000000000001",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "flow": "receiver",
+          "id": "src_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "source",
+          "owner": {
+            "address": null,
+            "email": "amount_0@stripe.com",
+            "name": null,
+            "phone": null,
+            "verified_address": null,
+            "verified_email": null,
+            "verified_name": null,
+            "verified_phone": null
+          },
+          "receiver": {
+            "address": "000000000-test_NORMALIZED01",
+            "amount_charged": 0,
+            "amount_received": 0,
+            "amount_returned": 0,
+            "refund_attributes_method": "email",
+            "refund_attributes_status": "missing"
+          },
+          "statement_descriptor": null,
+          "status": "pending",
+          "type": "ach_credit_transfer",
+          "usage": "reusable"
+        }
+      },
+      "id": "evt_1OqUsbDEQaroqDjsrmgTwutN",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "aa7cb6a4-5b05-4239-814b-d0e6e2312459"
+      },
+      "type": "customer.source.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": "usd",
+          "default_currency": "usd",
+          "default_source": "src_NORMALIZED00000000000001",
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 2,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "default_source": null
+        }
+      },
+      "id": "evt_1OqUsbDEQaroqDjs2I1EqYDm",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "aa7cb6a4-5b05-4239-814b-d0e6e2312459"
+      },
+      "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNA0200YhoK0kW7?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNA0200YhoK0kW7/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqUsaDEQaroqDjsNNgcS2gR",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "da555467-1c2f-4be3-aa4b-6990178e7a49"
+      },
+      "type": "invoice.finalized"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNA0200YhoK0kW7?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNA0200YhoK0kW7/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "effective_at": null,
+          "ending_balance": null,
+          "hosted_invoice_url": null,
+          "invoice_pdf": null,
+          "number": null,
+          "payment_intent": null,
+          "rendering": {
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null
+          }
+        }
+      },
+      "id": "evt_1OqUsaDEQaroqDjsWTS0J9CD",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "da555467-1c2f-4be3-aa4b-6990178e7a49"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": null,
+          "cancellation_reason": null,
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+          },
+          "client_secret": "pi_NORMALIZED00000000000001_secret_DqmcHawyi3fS7jmoFw8fNlu8s",
+          "confirmation_method": "automatic",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
+          },
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "requires_payment_method",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqUsaDEQaroqDjs1FZm1fyf",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "da555467-1c2f-4be3-aa4b-6990178e7a49"
+      },
+      "type": "payment_intent.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": null,
+          "ending_balance": null,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": null,
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": null,
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": null,
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqUsZDEQaroqDjsObWJj3tI",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "b52cfb1b-11ce-4a63-8f3e-18f52eb56884"
+      },
+      "type": "invoice.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "date": 1000000000,
+          "description": "Zulip Cloud Standard",
+          "discountable": false,
+          "discounts": [],
+          "id": "ii_NORMALIZED00000000000001",
+          "invoice": null,
+          "livemode": false,
+          "metadata": {},
+          "object": "invoiceitem",
+          "period": {
+            "end": 1000000000,
+            "start": 1000000000
+          },
+          "plan": null,
+          "price": {
+            "active": false,
+            "billing_scheme": "per_unit",
+            "created": 1000000000,
+            "currency": "usd",
+            "custom_unit_amount": null,
+            "id": "price_NORMALIZED00000000000001",
+            "livemode": false,
+            "lookup_key": null,
+            "metadata": {},
+            "nickname": null,
+            "object": "price",
+            "product": "prod_NORMALIZED0001",
+            "recurring": null,
+            "tax_behavior": "unspecified",
+            "tiers_mode": null,
+            "transform_quantity": null,
+            "type": "one_time",
+            "unit_amount": 8000,
+            "unit_amount_decimal": "8000"
+          },
+          "proration": false,
+          "quantity": 123,
+          "subscription": null,
+          "tax_rates": [],
+          "test_clock": null,
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        }
+      },
+      "id": "evt_1OqUsZDEQaroqDjsz2n2sl1B",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "272a55bb-4d96-4d0d-8b3b-1a698b2419f4"
+      },
+      "type": "invoiceitem.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": "usd",
+          "default_currency": "usd",
+          "default_source": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "currency": null,
+          "default_currency": null
+        }
+      },
+      "id": "evt_1OqUsZDEQaroqDjsqGWFqb9x",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "272a55bb-4d96-4d0d-8b3b-1a698b2419f4"
+      },
+      "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": null,
+          "default_currency": null,
+          "default_source": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        }
+      },
+      "id": "evt_1OqUsYDEQaroqDjsK3NO5gvw",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0006",
+        "idempotency_key": "2aa04fa8-c83a-4cab-b89f-f89f82882afd"
+      },
+      "type": "customer.created"
+    }
+  ],
+  "has_more": true,
+  "object": "list",
+  "url": "/v1/events"
+}
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.3.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.3.json
new file mode 100644
index 0000000000..ec45239645
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.3.json
@@ -0,0 +1,385 @@
+{
+  "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNw02008nvovPNE?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNw02008nvovPNE/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": true,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqUsdDEQaroqDjsOrgJ76fW",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "20fe148d-1a57-4cb7-9f48-e7b1209834be"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNw02008nvovPNE?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNw02008nvovPNE/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": true,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "auto_advance": true,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "status": "open",
+          "status_transitions": {
+            "paid_at": null
+          }
+        }
+      },
+      "id": "evt_1OqUsdDEQaroqDjsIRbyCG3w",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "20fe148d-1a57-4cb7-9f48-e7b1209834be"
+      },
+      "type": "invoice.updated"
+    }
+  ],
+  "has_more": false,
+  "object": "list",
+  "url": "/v1/events"
+}
diff --git a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.5.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.4.json
similarity index 100%
rename from corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.5.json
rename to corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.4.json
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.1.json
index 248f573039..be6f23a347 100644
--- a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.1.json
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000002",
+  "id": "in_NORMALIZED00000000000001",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -105,11 +106,12 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
@@ -163,5 +165,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.2.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.2.json
new file mode 100644
index 0000000000..64201e1d6d
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.2.json
@@ -0,0 +1,163 @@
+{
+  "account_country": "US",
+  "account_name": "Kandra Labs, Inc.",
+  "account_tax_ids": null,
+  "amount_due": 984000,
+  "amount_paid": 0,
+  "amount_remaining": 984000,
+  "amount_shipping": 0,
+  "application": null,
+  "application_fee_amount": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "auto_advance": true,
+  "automatic_tax": {
+    "enabled": false,
+    "liability": null,
+    "status": null
+  },
+  "billing_reason": "manual",
+  "charge": null,
+  "collection_method": "send_invoice",
+  "created": 1000000000,
+  "currency": "usd",
+  "custom_fields": null,
+  "customer": "cus_NORMALIZED0001",
+  "customer_address": null,
+  "customer_email": "hamlet@zulip.com",
+  "customer_name": null,
+  "customer_phone": null,
+  "customer_shipping": null,
+  "customer_tax_exempt": "none",
+  "customer_tax_ids": [],
+  "default_payment_method": null,
+  "default_source": null,
+  "default_tax_rates": [],
+  "description": null,
+  "discount": null,
+  "discounts": [],
+  "due_date": 1000000000,
+  "effective_at": null,
+  "ending_balance": null,
+  "footer": null,
+  "from_invoice": null,
+  "hosted_invoice_url": null,
+  "id": "in_NORMALIZED00000000000002",
+  "invoice_pdf": null,
+  "issuer": {
+    "type": "self"
+  },
+  "last_finalization_error": null,
+  "latest_revision": null,
+  "lines": {
+    "data": [
+      {
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
+        "currency": "usd",
+        "description": "Zulip Cloud Standard - renewal",
+        "discount_amounts": [],
+        "discountable": false,
+        "discounts": [],
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1388631845,
+          "start": 1357095845
+        },
+        "plan": null,
+        "price": {
+          "active": false,
+          "billing_scheme": "per_unit",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_unit_amount": null,
+          "id": "price_NORMALIZED00000000000002",
+          "livemode": false,
+          "lookup_key": null,
+          "metadata": {},
+          "nickname": null,
+          "object": "price",
+          "product": "prod_NORMALIZED0002",
+          "recurring": null,
+          "tax_behavior": "unspecified",
+          "tiers_mode": null,
+          "transform_quantity": null,
+          "type": "one_time",
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        },
+        "proration": false,
+        "proration_details": {
+          "credited_items": null
+        },
+        "quantity": 123,
+        "subscription": null,
+        "tax_amounts": [],
+        "tax_rates": [],
+        "type": "invoiceitem",
+        "unit_amount_excluding_tax": "8000"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+  },
+  "livemode": false,
+  "metadata": {},
+  "next_payment_attempt": null,
+  "number": null,
+  "object": "invoice",
+  "on_behalf_of": null,
+  "paid": false,
+  "paid_out_of_band": false,
+  "payment_intent": null,
+  "payment_settings": {
+    "default_mandate": null,
+    "payment_method_options": null,
+    "payment_method_types": null
+  },
+  "period_end": 1000000000,
+  "period_start": 1000000000,
+  "post_payment_credit_notes_amount": 0,
+  "pre_payment_credit_notes_amount": 0,
+  "quote": null,
+  "receipt_number": null,
+  "rendering": {
+    "amount_tax_display": null,
+    "pdf": {
+      "page_size": "auto"
+    }
+  },
+  "rendering_options": null,
+  "shipping_cost": null,
+  "shipping_details": null,
+  "starting_balance": 0,
+  "statement_descriptor": "Zulip Cloud Standard",
+  "status": "draft",
+  "status_transitions": {
+    "finalized_at": null,
+    "marked_uncollectible_at": null,
+    "paid_at": null,
+    "voided_at": null
+  },
+  "subscription": null,
+  "subscription_details": {
+    "metadata": null
+  },
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
+  "tax": null,
+  "test_clock": null,
+  "total": 984000,
+  "total_discount_amounts": [],
+  "total_excluding_tax": 984000,
+  "total_tax_amounts": [],
+  "transfer_data": null,
+  "webhooks_delivered_at": 1000000000
+}
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.1.json
index 59f5d3d18b..40f7d8f1b1 100644
--- a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxR0dVTGM1Yk5ZemtBcGZLQmplbjBrN0JpQXVMLDk4MDI5MDE10200M4oNGyz3?s=ap",
-  "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxR0dVTGM1Yk5ZemtBcGZLQmplbjBrN0JpQXVMLDk4MDI5MDE10200M4oNGyz3/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNA0200YhoK0kW7?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNA0200YhoK0kW7/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -105,11 +106,12 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
@@ -120,7 +122,7 @@
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_NORMALIZED00000000000002",
+  "payment_intent": "pi_NORMALIZED00000000000001",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
@@ -163,5 +165,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.2.json
similarity index 78%
rename from corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.2.json
rename to corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.2.json
index 2dda50b91c..b879c122e4 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.2.json
@@ -2,15 +2,15 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 48000,
+  "amount_due": 984000,
   "amount_paid": 0,
-  "amount_remaining": 48000,
+  "amount_remaining": 984000,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
   "attempt_count": 0,
   "attempted": false,
-  "auto_advance": false,
+  "auto_advance": true,
   "automatic_tax": {
     "enabled": false,
     "liability": null,
@@ -18,7 +18,7 @@
   },
   "billing_reason": "manual",
   "charge": null,
-  "collection_method": "charge_automatically",
+  "collection_method": "send_invoice",
   "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
@@ -36,14 +36,14 @@
   "description": null,
   "discount": null,
   "discounts": [],
-  "due_date": null,
+  "due_date": 1000000000,
   "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFadWdqZmlBN2lETm9qYU4waDlrVWJSTXh6RUUwLDEwMDA3NDAxMA0200ds8xImCc?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFadWdqZmlBN2lETm9qYU4waDlrVWJSTXh6RUUwLDEwMDA3NDAxMA0200ds8xImCc/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -52,21 +52,22 @@
   "lines": {
     "data": [
       {
-        "amount": 48000,
-        "amount_excluding_tax": 48000,
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
         "currency": "usd",
-        "description": "Zulip Cloud Standard",
+        "description": "Zulip Cloud Standard - renewal",
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1000000000,
-          "start": 1000000000
+          "end": 1388631845,
+          "start": 1357095845
         },
         "plan": null,
         "price": {
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -94,7 +95,7 @@
         "proration_details": {
           "credited_items": null
         },
-        "quantity": 6,
+        "quantity": 123,
         "subscription": null,
         "tax_amounts": [],
         "tax_rates": [],
@@ -108,15 +109,9 @@
     "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
-  "metadata": {
-    "billing_schedule": "1",
-    "license_management": "automatic",
-    "licenses": "6",
-    "plan_tier": "1",
-    "user_id": "12"
-  },
+  "metadata": {},
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -155,14 +150,14 @@
   "subscription_details": {
     "metadata": null
   },
-  "subtotal": 48000,
-  "subtotal_excluding_tax": 48000,
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
   "tax": null,
   "test_clock": null,
-  "total": 48000,
+  "total": 984000,
   "total_discount_amounts": [],
-  "total_excluding_tax": 48000,
+  "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.list.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.list.1.json
index 5f20b18fd4..68a88b6e99 100644
--- a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.list.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.list.1.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxR0dVTGM1Yk5ZemtBcGZLQmplbjBrN0JpQXVMLDk4MDI5MDE20200TJLiF2WE?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFadWdqZmlBN2lETm9qYU4waDlrVWJSTXh6RUUwLDEwMDA3NDAxMA0200ds8xImCc?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxR0dVTGM1Yk5ZemtBcGZLQmplbjBrN0JpQXVMLDk4MDI5MDE20200TJLiF2WE/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFadWdqZmlBN2lETm9qYU4waDlrVWJSTXh6RUUwLDEwMDA3NDAxMA0200ds8xImCc/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -57,18 +57,19 @@
             "amount": 984000,
             "amount_excluding_tax": 984000,
             "currency": "usd",
-            "description": "Zulip Cloud Standard",
+            "description": "Zulip Cloud Standard - renewal",
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
             "period": {
-              "end": 1000000000,
-              "start": 1000000000
+              "end": 1388631845,
+              "start": 1357095845
             },
             "plan": null,
             "price": {
@@ -110,14 +111,9 @@
         "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
       },
       "livemode": false,
-      "metadata": {
-        "billing_schedule": "1",
-        "licenses": "123",
-        "plan_tier": "1",
-        "user_id": "10"
-      },
+      "metadata": {},
       "next_payment_attempt": null,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -165,7 +161,176 @@
       "total_excluding_tax": 984000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
+    },
+    {
+      "account_country": "US",
+      "account_name": "Kandra Labs, Inc.",
+      "account_tax_ids": null,
+      "amount_due": 984000,
+      "amount_paid": 0,
+      "amount_remaining": 984000,
+      "amount_shipping": 0,
+      "application": null,
+      "application_fee_amount": null,
+      "attempt_count": 0,
+      "attempted": false,
+      "auto_advance": false,
+      "automatic_tax": {
+        "enabled": false,
+        "liability": null,
+        "status": null
+      },
+      "billing_reason": "manual",
+      "charge": null,
+      "collection_method": "send_invoice",
+      "created": 1000000000,
+      "currency": "usd",
+      "custom_fields": null,
+      "customer": "cus_NORMALIZED0001",
+      "customer_address": null,
+      "customer_email": "hamlet@zulip.com",
+      "customer_name": null,
+      "customer_phone": null,
+      "customer_shipping": null,
+      "customer_tax_exempt": "none",
+      "customer_tax_ids": [],
+      "default_payment_method": null,
+      "default_source": null,
+      "default_tax_rates": [],
+      "description": null,
+      "discount": null,
+      "discounts": [],
+      "due_date": 1000000000,
+      "effective_at": 1000000000,
+      "ending_balance": 0,
+      "footer": null,
+      "from_invoice": null,
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAxMA0200c1tXgIZx?s=ap",
+      "id": "in_NORMALIZED00000000000001",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAxMA0200c1tXgIZx/pdf?s=ap",
+      "issuer": {
+        "type": "self"
+      },
+      "last_finalization_error": null,
+      "latest_revision": null,
+      "lines": {
+        "data": [
+          {
+            "amount": 984000,
+            "amount_excluding_tax": 984000,
+            "currency": "usd",
+            "description": "Zulip Cloud Standard",
+            "discount_amounts": [],
+            "discountable": false,
+            "discounts": [],
+            "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
+            "invoice_item": "ii_NORMALIZED00000000000001",
+            "livemode": false,
+            "metadata": {},
+            "object": "line_item",
+            "period": {
+              "end": 1000000000,
+              "start": 1000000000
+            },
+            "plan": null,
+            "price": {
+              "active": false,
+              "billing_scheme": "per_unit",
+              "created": 1000000000,
+              "currency": "usd",
+              "custom_unit_amount": null,
+              "id": "price_NORMALIZED00000000000001",
+              "livemode": false,
+              "lookup_key": null,
+              "metadata": {},
+              "nickname": null,
+              "object": "price",
+              "product": "prod_NORMALIZED0001",
+              "recurring": null,
+              "tax_behavior": "unspecified",
+              "tiers_mode": null,
+              "transform_quantity": null,
+              "type": "one_time",
+              "unit_amount": 8000,
+              "unit_amount_decimal": "8000"
+            },
+            "proration": false,
+            "proration_details": {
+              "credited_items": null
+            },
+            "quantity": 123,
+            "subscription": null,
+            "tax_amounts": [],
+            "tax_rates": [],
+            "type": "invoiceitem",
+            "unit_amount_excluding_tax": "8000"
+          }
+        ],
+        "has_more": false,
+        "object": "list",
+        "total_count": 1,
+        "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+      },
+      "livemode": false,
+      "metadata": {
+        "billing_schedule": "1",
+        "license_management": "manual",
+        "licenses": "123",
+        "plan_tier": "1",
+        "user_id": "10"
+      },
+      "next_payment_attempt": null,
+      "number": "NORMALI-0002",
+      "object": "invoice",
+      "on_behalf_of": null,
+      "paid": true,
+      "paid_out_of_band": true,
+      "payment_intent": null,
+      "payment_settings": {
+        "default_mandate": null,
+        "payment_method_options": null,
+        "payment_method_types": null
+      },
+      "period_end": 1000000000,
+      "period_start": 1000000000,
+      "post_payment_credit_notes_amount": 0,
+      "pre_payment_credit_notes_amount": 0,
+      "quote": null,
+      "receipt_number": null,
+      "rendering": {
+        "amount_tax_display": null,
+        "pdf": {
+          "page_size": "letter"
+        }
+      },
+      "rendering_options": null,
+      "shipping_cost": null,
+      "shipping_details": null,
+      "starting_balance": 0,
+      "statement_descriptor": "Zulip Cloud Standard",
+      "status": "paid",
+      "status_transitions": {
+        "finalized_at": 1000000000,
+        "marked_uncollectible_at": null,
+        "paid_at": 1000000000,
+        "voided_at": null
+      },
+      "subscription": null,
+      "subscription_details": {
+        "metadata": null
+      },
+      "subtotal": 984000,
+      "subtotal_excluding_tax": 984000,
+      "tax": null,
+      "test_clock": null,
+      "total": 984000,
+      "total_discount_amounts": [],
+      "total_excluding_tax": 984000,
+      "total_tax_amounts": [],
+      "transfer_data": null,
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.pay.1.json
new file mode 100644
index 0000000000..8c6845bb07
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.pay.1.json
@@ -0,0 +1,169 @@
+{
+  "account_country": "US",
+  "account_name": "Kandra Labs, Inc.",
+  "account_tax_ids": null,
+  "amount_due": 984000,
+  "amount_paid": 0,
+  "amount_remaining": 984000,
+  "amount_shipping": 0,
+  "application": null,
+  "application_fee_amount": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "auto_advance": false,
+  "automatic_tax": {
+    "enabled": false,
+    "liability": null,
+    "status": null
+  },
+  "billing_reason": "manual",
+  "charge": null,
+  "collection_method": "send_invoice",
+  "created": 1000000000,
+  "currency": "usd",
+  "custom_fields": null,
+  "customer": "cus_NORMALIZED0001",
+  "customer_address": null,
+  "customer_email": "hamlet@zulip.com",
+  "customer_name": null,
+  "customer_phone": null,
+  "customer_shipping": null,
+  "customer_tax_exempt": "none",
+  "customer_tax_ids": [],
+  "default_payment_method": null,
+  "default_source": null,
+  "default_tax_rates": [],
+  "description": null,
+  "discount": null,
+  "discounts": [],
+  "due_date": 1000000000,
+  "effective_at": 1000000000,
+  "ending_balance": 0,
+  "footer": null,
+  "from_invoice": null,
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNw02008nvovPNE?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFab29kRFFHeFR3NERmeGRkOUFIaDBVWHJ1czk5LDEwMDA3NDAwNw02008nvovPNE/pdf?s=ap",
+  "issuer": {
+    "type": "self"
+  },
+  "last_finalization_error": null,
+  "latest_revision": null,
+  "lines": {
+    "data": [
+      {
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
+        "currency": "usd",
+        "description": "Zulip Cloud Standard",
+        "discount_amounts": [],
+        "discountable": false,
+        "discounts": [],
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1000000000,
+          "start": 1000000000
+        },
+        "plan": null,
+        "price": {
+          "active": false,
+          "billing_scheme": "per_unit",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_unit_amount": null,
+          "id": "price_NORMALIZED00000000000001",
+          "livemode": false,
+          "lookup_key": null,
+          "metadata": {},
+          "nickname": null,
+          "object": "price",
+          "product": "prod_NORMALIZED0001",
+          "recurring": null,
+          "tax_behavior": "unspecified",
+          "tiers_mode": null,
+          "transform_quantity": null,
+          "type": "one_time",
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        },
+        "proration": false,
+        "proration_details": {
+          "credited_items": null
+        },
+        "quantity": 123,
+        "subscription": null,
+        "tax_amounts": [],
+        "tax_rates": [],
+        "type": "invoiceitem",
+        "unit_amount_excluding_tax": "8000"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+  },
+  "livemode": false,
+  "metadata": {
+    "billing_schedule": "1",
+    "license_management": "manual",
+    "licenses": "123",
+    "plan_tier": "1",
+    "user_id": "10"
+  },
+  "next_payment_attempt": null,
+  "number": "NORMALI-0002",
+  "object": "invoice",
+  "on_behalf_of": null,
+  "paid": true,
+  "paid_out_of_band": true,
+  "payment_intent": null,
+  "payment_settings": {
+    "default_mandate": null,
+    "payment_method_options": null,
+    "payment_method_types": null
+  },
+  "period_end": 1000000000,
+  "period_start": 1000000000,
+  "post_payment_credit_notes_amount": 0,
+  "pre_payment_credit_notes_amount": 0,
+  "quote": null,
+  "receipt_number": null,
+  "rendering": {
+    "amount_tax_display": null,
+    "pdf": {
+      "page_size": "letter"
+    }
+  },
+  "rendering_options": null,
+  "shipping_cost": null,
+  "shipping_details": null,
+  "starting_balance": 0,
+  "statement_descriptor": "Zulip Cloud Standard",
+  "status": "paid",
+  "status_transitions": {
+    "finalized_at": 1000000000,
+    "marked_uncollectible_at": null,
+    "paid_at": 1000000000,
+    "voided_at": null
+  },
+  "subscription": null,
+  "subscription_details": {
+    "metadata": null
+  },
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
+  "tax": null,
+  "test_clock": null,
+  "total": 984000,
+  "total_discount_amounts": [],
+  "total_excluding_tax": 984000,
+  "total_tax_amounts": [],
+  "transfer_data": null,
+  "webhooks_delivered_at": 1000000000
+}
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.void_invoice.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.void_invoice.1.json
index 80e63de131..a9fec8f92e 100644
--- a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.void_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.void_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxR0dVTGM1Yk5ZemtBcGZLQmplbjBrN0JpQXVMLDk4MDI5MDE30200cyUvrbMK?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFadWdqZmlBN2lETm9qYU4waDlrVWJSTXh6RUUwLDEwMDA3NDAxMQ0200BPbjtb5v?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxR0dVTGM1Yk5ZemtBcGZLQmplbjBrN0JpQXVMLDk4MDI5MDE30200cyUvrbMK/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED02a3dERVFhcm9xRGpzLF9QZnFadWdqZmlBN2lETm9qYU4waDlrVWJSTXh6RUUwLDEwMDA3NDAxMQ0200BPbjtb5v/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -55,18 +55,19 @@
         "amount": 984000,
         "amount_excluding_tax": 984000,
         "currency": "usd",
-        "description": "Zulip Cloud Standard",
+        "description": "Zulip Cloud Standard - renewal",
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1000000000,
-          "start": 1000000000
+          "end": 1388631845,
+          "start": 1357095845
         },
         "plan": null,
         "price": {
@@ -108,14 +109,9 @@
     "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
-  "metadata": {
-    "billing_schedule": "1",
-    "licenses": "123",
-    "plan_tier": "1",
-    "user_id": "10"
-  },
+  "metadata": {},
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.1.json
index e1df3adcba..40cfc90def 100644
--- a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.1.json
@@ -6,7 +6,7 @@
   "description": "Zulip Cloud Standard",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000002",
+  "id": "ii_NORMALIZED00000000000001",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -22,13 +22,13 @@
     "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000002",
+    "id": "price_NORMALIZED00000000000001",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0002",
+    "product": "prod_NORMALIZED0001",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.2.json
new file mode 100644
index 0000000000..10ecd34a29
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.2.json
@@ -0,0 +1,47 @@
+{
+  "amount": 984000,
+  "currency": "usd",
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
+  "description": "Zulip Cloud Standard - renewal",
+  "discountable": false,
+  "discounts": [],
+  "id": "ii_NORMALIZED00000000000002",
+  "invoice": null,
+  "livemode": false,
+  "metadata": {},
+  "object": "invoiceitem",
+  "period": {
+    "end": 1388631845,
+    "start": 1357095845
+  },
+  "plan": null,
+  "price": {
+    "active": false,
+    "billing_scheme": "per_unit",
+    "created": 1000000000,
+    "currency": "usd",
+    "custom_unit_amount": null,
+    "id": "price_NORMALIZED00000000000002",
+    "livemode": false,
+    "lookup_key": null,
+    "metadata": {},
+    "nickname": null,
+    "object": "price",
+    "product": "prod_NORMALIZED0002",
+    "recurring": null,
+    "tax_behavior": "unspecified",
+    "tiers_mode": null,
+    "transform_quantity": null,
+    "type": "one_time",
+    "unit_amount": 8000,
+    "unit_amount_decimal": "8000"
+  },
+  "proration": false,
+  "quantity": 123,
+  "subscription": null,
+  "tax_rates": [],
+  "test_clock": null,
+  "unit_amount": 8000,
+  "unit_amount_decimal": "8000"
+}
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.1.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.1.json
index 49626a2fb0..41fd4ff6d8 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.2.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.2.json
index 8d16968939..891cf3bb10 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.3.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.3.json
index 2efdd93c7c..26a333bed8 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.3.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.4.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.4.json
index f5acf530e4..31e2c6a4e6 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.4.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.4.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000004",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.5.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.5.json
index aa5d32391c..75a85caca7 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.5.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.5.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000005",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.6.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.6.json
index f1a8c8c62f..337f687826 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.6.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.6.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000006",
+        "invoice": "in_NORMALIZED00000000000006",
         "invoice_item": "ii_NORMALIZED00000000000006",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.7.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.7.json
index 0831397e6f..f1bde28c0a 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.7.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.7.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000007",
+        "invoice": "in_NORMALIZED00000000000007",
         "invoice_item": "ii_NORMALIZED00000000000007",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.8.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.8.json
index 2d9b7b2621..c6331633a8 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.8.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.8.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000008",
+        "invoice": "in_NORMALIZED00000000000008",
         "invoice_item": "ii_NORMALIZED00000000000008",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.1.json
index d7f7986301..95e891acbd 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDQ40200SWDcMOWA?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgwMw0200ZVBmTXEJ?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDQ40200SWDcMOWA/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgwMw0200ZVBmTXEJ/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.2.json
index 96ab408a57..4ebaf9ae2e 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loR3RsbEhvZktxdUEyT1g5QjhKekNMSDZMOGIwLDk4MDI4NDUx02008ql7ckqA?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Oa1pWdW0wZWNqNm9hQjRPaEI2bVlmdGQ3TE9YLDEwMDA2NTgwNg0200bX3yMCTj?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loR3RsbEhvZktxdUEyT1g5QjhKekNMSDZMOGIwLDk4MDI4NDUx02008ql7ckqA/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Oa1pWdW0wZWNqNm9hQjRPaEI2bVlmdGQ3TE9YLDEwMDA2NTgwNg0200bX3yMCTj/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.3.json
index c383669b51..e44d0605ef 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDUz0200Lxl6p3mA?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgwOA02005jxHMDW5?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDUz0200Lxl6p3mA/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgwOA02005jxHMDW5/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.4.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.4.json
index d1a29f8621..9b144fd9bb 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.4.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.4.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDU20200sdetNv7u?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgxMA0200Vc1sT8RI?s=ap",
   "id": "in_NORMALIZED00000000000004",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDU20200sdetNv7u/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgxMA0200Vc1sT8RI/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000004",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.5.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.5.json
index df170a2608..8cf49f30b9 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.5.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.5.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loQ0ZHbVNCOTF4U1ZwOUJXTTU5bWJqN2dGM2FILDk4MDI4NDU40200AhoHlcdm?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdVNkMU4yMmxtS0VqZFQxeGhHZFpTM1plZVV3LDEwMDA2NTgxMg0200mDc9Pm6B?s=ap",
   "id": "in_NORMALIZED00000000000005",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loQ0ZHbVNCOTF4U1ZwOUJXTTU5bWJqN2dGM2FILDk4MDI4NDU40200AhoHlcdm/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdVNkMU4yMmxtS0VqZFQxeGhHZFpTM1plZVV3LDEwMDA2NTgxMg0200mDc9Pm6B/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000005",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.6.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.6.json
index 0fdb605a86..8d6b10db0b 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.6.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.6.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDYw0200g8lU9UdZ?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgxNA0200f6W8pPFE?s=ap",
   "id": "in_NORMALIZED00000000000006",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDYw0200g8lU9UdZ/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgxNA0200f6W8pPFE/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000006",
+        "invoice": "in_NORMALIZED00000000000006",
         "invoice_item": "ii_NORMALIZED00000000000006",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.7.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.7.json
index 5b25ea66ae..164c99c653 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.7.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.7.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loVGtybVZmVDJDNjV5OUNPOHBkaW1zdWpNazdPLDk4MDI4NDYz020097iTswsh?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OVGNCVHJObmI1RERIb1YyM1pYbUV2TDk3ZGFlLDEwMDA2NTgxNw0200zTTdsXyw?s=ap",
   "id": "in_NORMALIZED00000000000007",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loVGtybVZmVDJDNjV5OUNPOHBkaW1zdWpNazdPLDk4MDI4NDYz020097iTswsh/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OVGNCVHJObmI1RERIb1YyM1pYbUV2TDk3ZGFlLDEwMDA2NTgxNw0200zTTdsXyw/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000007",
+        "invoice": "in_NORMALIZED00000000000007",
         "invoice_item": "ii_NORMALIZED00000000000007",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.8.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.8.json
index f26c8230cf..0fd5f72ad4 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.8.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.8.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loczJFWmx4OWJ0MW5BcmlydkN6dFBYV2FHMm5ULDk4MDI4NDY102009j0oa3uE?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdkdvQXVlU0FPOVBUS2JwOGhjWHB6c2hzRXZrLDEwMDA2NTgxOQ0200HkHDdApR?s=ap",
   "id": "in_NORMALIZED00000000000008",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loczJFWmx4OWJ0MW5BcmlydkN6dFBYV2FHMm5ULDk4MDI4NDY102009j0oa3uE/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdkdvQXVlU0FPOVBUS2JwOGhjWHB6c2hzRXZrLDEwMDA2NTgxOQ0200HkHDdApR/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000008",
+        "invoice": "in_NORMALIZED00000000000008",
         "invoice_item": "ii_NORMALIZED00000000000008",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.10.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.10.json
index dbcfa57263..74df82a3e9 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.10.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.10.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDcw0200MRYQsUfM?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgyNA0200QaYlpv2O?s=ap",
       "id": "in_NORMALIZED00000000000006",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDcw0200MRYQsUfM/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgyNA0200QaYlpv2O/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000006",
+            "invoice": "in_NORMALIZED00000000000006",
             "invoice_item": "ii_NORMALIZED00000000000006",
             "livemode": false,
             "metadata": {},
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loQ0ZHbVNCOTF4U1ZwOUJXTTU5bWJqN2dGM2FILDk4MDI4NDcw0200qCJVbFnS?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdVNkMU4yMmxtS0VqZFQxeGhHZFpTM1plZVV3LDEwMDA2NTgyNA0200So3Bck5H?s=ap",
       "id": "in_NORMALIZED00000000000005",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loQ0ZHbVNCOTF4U1ZwOUJXTTU5bWJqN2dGM2FILDk4MDI4NDcw0200qCJVbFnS/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdVNkMU4yMmxtS0VqZFQxeGhHZFpTM1plZVV3LDEwMDA2NTgyNA0200So3Bck5H/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000005",
+            "invoice": "in_NORMALIZED00000000000005",
             "invoice_item": "ii_NORMALIZED00000000000005",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.12.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.12.json
index 2011a42942..e6ab5680c8 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.12.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.12.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loR3RsbEhvZktxdUEyT1g5QjhKekNMSDZMOGIwLDk4MDI4NDcx0200FIiHULky?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Oa1pWdW0wZWNqNm9hQjRPaEI2bVlmdGQ3TE9YLDEwMDA2NTgyNQ0200VSfyNHm5?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loR3RsbEhvZktxdUEyT1g5QjhKekNMSDZMOGIwLDk4MDI4NDcx0200FIiHULky/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Oa1pWdW0wZWNqNm9hQjRPaEI2bVlmdGQ3TE9YLDEwMDA2NTgyNQ0200VSfyNHm5/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.13.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.13.json
index 6d459870f2..4cbacc2413 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.13.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.13.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDcx0200YFkYdEgg?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyNQ02004ziKs2eL?s=ap",
       "id": "in_NORMALIZED00000000000004",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDcx0200YFkYdEgg/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyNQ02004ziKs2eL/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000004",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.14.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.14.json
index 420715167a..c619abc49e 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.14.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.14.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDcy0200yslSDgbF?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgyNg0200Z1UnR0P7?s=ap",
       "id": "in_NORMALIZED00000000000006",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDcy0200yslSDgbF/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgyNg0200Z1UnR0P7/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000006",
+            "invoice": "in_NORMALIZED00000000000006",
             "invoice_item": "ii_NORMALIZED00000000000006",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.15.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.15.json
index 5b612900fe..7d45134549 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.15.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.15.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loczJFWmx4OWJ0MW5BcmlydkN6dFBYV2FHMm5ULDk4MDI4NDcy0200B9fMwtdg?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdkdvQXVlU0FPOVBUS2JwOGhjWHB6c2hzRXZrLDEwMDA2NTgyNg0200YRZ2P7hm?s=ap",
       "id": "in_NORMALIZED00000000000008",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loczJFWmx4OWJ0MW5BcmlydkN6dFBYV2FHMm5ULDk4MDI4NDcy0200B9fMwtdg/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdkdvQXVlU0FPOVBUS2JwOGhjWHB6c2hzRXZrLDEwMDA2NTgyNg0200YRZ2P7hm/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000008",
+            "invoice": "in_NORMALIZED00000000000008",
             "invoice_item": "ii_NORMALIZED00000000000008",
             "livemode": false,
             "metadata": {},
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loVGtybVZmVDJDNjV5OUNPOHBkaW1zdWpNazdPLDk4MDI4NDcy0200niMBECU0?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OVGNCVHJObmI1RERIb1YyM1pYbUV2TDk3ZGFlLDEwMDA2NTgyNg02006W13DpvT?s=ap",
       "id": "in_NORMALIZED00000000000007",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loVGtybVZmVDJDNjV5OUNPOHBkaW1zdWpNazdPLDk4MDI4NDcy0200niMBECU0/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OVGNCVHJObmI1RERIb1YyM1pYbUV2TDk3ZGFlLDEwMDA2NTgyNg02006W13DpvT/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000007",
+            "invoice": "in_NORMALIZED00000000000007",
             "invoice_item": "ii_NORMALIZED00000000000007",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.2.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.2.json
index 389a27baa9..ef84e99478 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDY20200FGxk31zR?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgyMA0200Vz4i5iRV?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDY20200FGxk31zR/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgyMA0200Vz4i5iRV/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.3.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.3.json
index 389a27baa9..ef84e99478 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.3.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.3.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDY20200FGxk31zR?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgyMA0200Vz4i5iRV?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDY20200FGxk31zR/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgyMA0200Vz4i5iRV/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.6.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.6.json
index 05f8941be5..cedaaa60e3 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.6.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.6.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loR3RsbEhvZktxdUEyT1g5QjhKekNMSDZMOGIwLDk4MDI4NDY40200XUpGuXnh?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Oa1pWdW0wZWNqNm9hQjRPaEI2bVlmdGQ3TE9YLDEwMDA2NTgyMg0200gWmkMRM8?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loR3RsbEhvZktxdUEyT1g5QjhKekNMSDZMOGIwLDk4MDI4NDY40200XUpGuXnh/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Oa1pWdW0wZWNqNm9hQjRPaEI2bVlmdGQ3TE9YLDEwMDA2NTgyMg0200gWmkMRM8/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.7.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.7.json
index 6e4609d75f..2f0df1dc88 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.7.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.7.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDY40200ewY7xPf5?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyMg0200b3l8ogYw?s=ap",
       "id": "in_NORMALIZED00000000000004",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDY40200ewY7xPf5/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyMg0200b3l8ogYw/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000004",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDY40200CYGJ8W9Q?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgyMg0200yGMYbSH4?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDY40200CYGJ8W9Q/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgyMg0200yGMYbSH4/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.8.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.8.json
index 6e4609d75f..2f0df1dc88 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.8.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.8.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDY40200ewY7xPf5?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyMg0200b3l8ogYw?s=ap",
       "id": "in_NORMALIZED00000000000004",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDY40200ewY7xPf5/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyMg0200b3l8ogYw/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000004",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDY40200CYGJ8W9Q?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgyMg0200yGMYbSH4?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDY40200CYGJ8W9Q/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgyMg0200yGMYbSH4/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.1.json
index 03b566ba93..9d358dbbe4 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loQ0ZHbVNCOTF4U1ZwOUJXTTU5bWJqN2dGM2FILDk4MDI4NDYx02003y43kW2U?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdVNkMU4yMmxtS0VqZFQxeGhHZFpTM1plZVV3LDEwMDA2NTgxNA0200mmWglPtI?s=ap",
   "id": "in_NORMALIZED00000000000005",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loQ0ZHbVNCOTF4U1ZwOUJXTTU5bWJqN2dGM2FILDk4MDI4NDYx02003y43kW2U/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OdVNkMU4yMmxtS0VqZFQxeGhHZFpTM1plZVV3LDEwMDA2NTgxNA0200mmWglPtI/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000005",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.2.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.2.json
index 2d238fe928..f9f99b839e 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.2.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDYx0200lTkXzpnU?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgxNQ0200mB38Vqek?s=ap",
   "id": "in_NORMALIZED00000000000006",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loUTdmYWJ1aFYwWjkzOVVYMTNvUjFvWkhBTVUyLDk4MDI4NDYx0200lTkXzpnU/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OUGgxRWlVNTJya1JtbmpyQllDbHZnWGdhNXBRLDEwMDA2NTgxNQ0200mB38Vqek/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000006",
+        "invoice": "in_NORMALIZED00000000000006",
         "invoice_item": "ii_NORMALIZED00000000000006",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.1.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.1.json
index 88971849f5..b858fbb8f7 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDY30200NR9pNg66?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgyMQ0200oRBuspW6?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loOFROTGNEdllPb1F1Z285V0NOMVRZNGs4bFpyLDk4MDI4NDY30200NR9pNg66/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OaVJEM2NWa2NXZ1RLRDFEWlJUTnBDQnpIY05SLDEwMDA2NTgyMQ0200oRBuspW6/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.2.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.2.json
index 0ee6c9ba92..664d413c89 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDY5020006ZFbLkh?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyMw0200WexNZt8y?s=ap",
   "id": "in_NORMALIZED00000000000004",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lodGNCQWJqeUE1R1Z5OVFDS1AzbHIxUmdpNER2LDk4MDI4NDY5020006ZFbLkh/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OYkc3TnBMNzBON2hqZXRsSkIzTnNzYjl5VlNVLDEwMDA2NTgyMw0200WexNZt8y/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000004",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.3.json b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.3.json
index 8468738adb..3c4ccdb3c8 100644
--- a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDY50200dgWF8tce?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgyMw0200LEM6RRXq?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loY0tOT3FuSWgxMTdsR0VOSnpCSElCdnNBMFdTLDk4MDI4NDY50200dgWF8tce/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OeHI4MllqTzM1d0pydUkxbFlhQkxUZUg4Qm52LDEwMDA2NTgyMw0200LEM6RRXq/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Customer.retrieve.1.json
new file mode 100644
index 0000000000..593a07ed0c
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Customer.retrieve.1.json
@@ -0,0 +1,33 @@
+{
+  "address": null,
+  "balance": 0,
+  "created": 1000000000,
+  "currency": null,
+  "default_currency": null,
+  "default_source": null,
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
+  "invoice_settings": {
+    "custom_fields": null,
+    "default_payment_method": null,
+    "footer": null,
+    "rendering_options": null
+  },
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "name": null,
+  "next_invoice_sequence": 1,
+  "object": "customer",
+  "phone": null,
+  "preferred_locales": [],
+  "shipping": null,
+  "tax_exempt": "none",
+  "test_clock": null
+}
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.1.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.1.json
index aafc508c78..e372584dc6 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.1.json
@@ -8,23 +8,23 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
+          "amount_due": 960000,
+          "amount_paid": 0,
+          "amount_remaining": 960000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
           "automatic_tax": {
             "enabled": false,
             "liability": null,
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
+          "charge": null,
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -42,14 +42,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
+          "due_date": 1000000000,
           "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lOcG1ybm1QUk16bjdyMDhsY0pndVdJU1J5SFBNLDk4MDI3MjY0020060d3dqs6?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm8ydG1qTVRhZ2kyWFZkSGVHcEE4b1FJcG9jZjlILDEwMDA2NDk4Nw0200jSmSHF4m?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lOcG1ybm1QUk16bjdyMDhsY0pndVdJU1J5SFBNLDk4MDI3MjY0020060d3dqs6/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm8ydG1qTVRhZ2kyWFZkSGVHcEE4b1FJcG9jZjlILDEwMDA2NDk4Nw0200jSmSHF4m/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -58,21 +58,22 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 960000,
+                "amount_excluding_tax": 960000,
                 "currency": "usd",
-                "description": "Zulip Cloud Standard",
+                "description": "Zulip Cloud Standard - renewal",
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
+                  "end": 1420167845,
+                  "start": 1388631845
                 },
                 "plan": null,
                 "price": {
@@ -100,7 +101,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 120,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -114,18 +115,12 @@
             "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
+          "metadata": {},
           "next_payment_attempt": null,
           "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
-          "paid": true,
+          "paid": false,
           "paid_out_of_band": false,
           "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
@@ -150,38 +145,38 @@
           "shipping_details": null,
           "starting_balance": 0,
           "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
+          "status": "open",
           "status_transitions": {
             "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
+            "paid_at": null,
             "voided_at": null
           },
           "subscription": null,
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 960000,
+          "subtotal_excluding_tax": 960000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 960000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 960000,
           "total_tax_amounts": [],
           "transfer_data": null,
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuQeDEQaroqDjsIJOPiC7c",
+      "id": "evt_1OqSX9DEQaroqDjsbAdfYJ8d",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0001",
-        "idempotency_key": "1bcdf1ef-cd9f-462b-bcfd-59a97d9a944c"
+        "id": null,
+        "idempotency_key": null
       },
-      "type": "invoice.payment_succeeded"
+      "type": "invoice.sent"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.7.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.2.json
similarity index 52%
rename from corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.7.json
rename to corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.2.json
index bf29d1865b..b6741d24e0 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.7.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.2.json
@@ -8,14 +8,14 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
+          "attempt_count": 0,
+          "attempted": false,
           "auto_advance": false,
           "automatic_tax": {
             "enabled": false,
@@ -23,8 +23,8 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000002",
-          "collection_method": "charge_automatically",
+          "charge": null,
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -42,14 +42,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
+          "due_date": 1000000000,
           "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNg0200N9IRXCg2?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNg0200N9IRXCg2/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -58,14 +58,15 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -81,13 +82,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -100,7 +101,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 123,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -116,18 +117,18 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "123",
             "plan_tier": "1",
-            "user_id": "12"
+            "user_id": "10"
           },
           "next_payment_attempt": null,
           "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
+          "paid_out_of_band": true,
+          "payment_intent": null,
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -161,220 +162,35 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 984000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhunfDEQaroqDjs471hQ3ZI",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
-      },
-      "type": "invoice.paid"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000002",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 984000,
           "total_tax_amounts": [],
           "transfer_data": null,
           "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "attempt_count": 0,
-          "attempted": false,
-          "charge": null,
+          "auto_advance": true,
           "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
           "status": "open",
           "status_transitions": {
             "paid_at": null
           }
         }
       },
-      "id": "evt_1OhunfDEQaroqDjsKZ8IjMJ5",
+      "id": "evt_1OqSikDEQaroqDjszJ2k1S3f",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "f5738def-9a15-497d-8d9a-10ccbdca5423"
       },
       "type": "invoice.updated"
     },
@@ -383,709 +199,7 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "amount": 48000,
-          "amount_capturable": 0,
-          "amount_details": {
-            "tip": {}
-          },
-          "amount_received": 48000,
-          "application": null,
-          "application_fee_amount": null,
-          "automatic_payment_methods": null,
-          "canceled_at": null,
-          "cancellation_reason": null,
-          "capture_method": "automatic",
-          "charges": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_captured": 48000,
-                "amount_refunded": 0,
-                "application": null,
-                "application_fee": null,
-                "application_fee_amount": null,
-                "balance_transaction": "txn_NORMALIZED00000000000001",
-                "billing_details": {
-                  "address": {
-                    "city": null,
-                    "country": null,
-                    "line1": null,
-                    "line2": null,
-                    "postal_code": null,
-                    "state": null
-                  },
-                  "email": null,
-                  "name": null,
-                  "phone": null
-                },
-                "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
-                "captured": true,
-                "created": 1000000000,
-                "currency": "usd",
-                "customer": "cus_NORMALIZED0001",
-                "description": "Payment for Invoice",
-                "destination": null,
-                "dispute": null,
-                "disputed": false,
-                "failure_balance_transaction": null,
-                "failure_code": null,
-                "failure_message": null,
-                "fraud_details": {},
-                "id": "ch_NORMALIZED00000000000002",
-                "invoice": "in_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "charge",
-                "on_behalf_of": null,
-                "order": null,
-                "outcome": {
-                  "network_status": "approved_by_network",
-                  "reason": null,
-                  "risk_level": "normal",
-                  "risk_score": 0,
-                  "seller_message": "Payment complete.",
-                  "type": "authorized"
-                },
-                "paid": true,
-                "payment_intent": "pi_NORMALIZED00000000000002",
-                "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-                "payment_method_details": {
-                  "card": {
-                    "amount_authorized": 48000,
-                    "brand": "visa",
-                    "checks": {
-                      "address_line1_check": null,
-                      "address_postal_code_check": null,
-                      "cvc_check": "pass"
-                    },
-                    "country": "US",
-                    "exp_month": 2,
-                    "exp_year": 2025,
-                    "extended_authorization": {
-                      "status": "disabled"
-                    },
-                    "fingerprint": "NORMALIZED000001",
-                    "funding": "credit",
-                    "incremental_authorization": {
-                      "status": "unavailable"
-                    },
-                    "installments": null,
-                    "last4": "4242",
-                    "mandate": null,
-                    "multicapture": {
-                      "status": "unavailable"
-                    },
-                    "network": "visa",
-                    "network_token": {
-                      "used": false
-                    },
-                    "overcapture": {
-                      "maximum_amount_capturable": 48000,
-                      "status": "unavailable"
-                    },
-                    "three_d_secure": null,
-                    "wallet": null
-                  },
-                  "type": "card"
-                },
-                "radar_options": {},
-                "receipt_email": "hamlet@zulip.com",
-                "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJPlmK4GMgbnrPVJ1_Q6LBZ5Rw1M7CR75lyQ2nCguEwc7Jwh4CIKzlDZSws3k2gj0Nt-ovi94DAmg7lW?s=ap",
-                "refunded": false,
-                "refunds": {
-                  "data": [],
-                  "has_more": false,
-                  "object": "list",
-                  "total_count": 0,
-                  "url": "/v1/charges/ch_NORMALIZED00000000000002/refunds"
-                },
-                "review": null,
-                "shipping": null,
-                "source": null,
-                "source_transfer": null,
-                "statement_descriptor": "Zulip Cloud Standard",
-                "statement_descriptor_suffix": null,
-                "status": "succeeded",
-                "transfer_data": null,
-                "transfer_group": null
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
-          },
-          "client_secret": "pi_NORMALIZED00000000000002_secret_r9MqQIHw0FgWT989cYbXBmKar",
-          "confirmation_method": "automatic",
-          "created": 1000000000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000002",
-          "invoice": "in_NORMALIZED00000000000002",
-          "last_payment_error": null,
-          "latest_charge": "ch_NORMALIZED00000000000002",
-          "livemode": false,
-          "metadata": {},
-          "next_action": null,
-          "object": "payment_intent",
-          "on_behalf_of": null,
-          "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-          "payment_method_configuration_details": null,
-          "payment_method_options": {
-            "card": {
-              "installments": null,
-              "mandate_options": null,
-              "network": null,
-              "request_three_d_secure": "automatic"
-            },
-            "cashapp": {}
-          },
-          "payment_method_types": [
-            "card",
-            "cashapp"
-          ],
-          "processing": null,
-          "receipt_email": "hamlet@zulip.com",
-          "review": null,
-          "setup_future_usage": null,
-          "shipping": null,
-          "source": null,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "statement_descriptor_suffix": null,
-          "status": "succeeded",
-          "transfer_data": null,
-          "transfer_group": null
-        }
-      },
-      "id": "evt_3OhuncDEQaroqDjs1U25K8Yd",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
-      },
-      "type": "payment_intent.succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
-          "amount_captured": 48000,
-          "amount_refunded": 0,
-          "application": null,
-          "application_fee": null,
-          "application_fee_amount": null,
-          "balance_transaction": "txn_NORMALIZED00000000000001",
-          "billing_details": {
-            "address": {
-              "city": null,
-              "country": null,
-              "line1": null,
-              "line2": null,
-              "postal_code": null,
-              "state": null
-            },
-            "email": null,
-            "name": null,
-            "phone": null
-          },
-          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
-          "captured": true,
-          "created": 1000000000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "description": "Payment for Invoice",
-          "destination": null,
-          "dispute": null,
-          "disputed": false,
-          "failure_balance_transaction": null,
-          "failure_code": null,
-          "failure_message": null,
-          "fraud_details": {},
-          "id": "ch_NORMALIZED00000000000002",
-          "invoice": "in_NORMALIZED00000000000002",
-          "livemode": false,
-          "metadata": {},
-          "object": "charge",
-          "on_behalf_of": null,
-          "order": null,
-          "outcome": {
-            "network_status": "approved_by_network",
-            "reason": null,
-            "risk_level": "normal",
-            "risk_score": 0,
-            "seller_message": "Payment complete.",
-            "type": "authorized"
-          },
-          "paid": true,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-          "payment_method_details": {
-            "card": {
-              "amount_authorized": 48000,
-              "brand": "visa",
-              "checks": {
-                "address_line1_check": null,
-                "address_postal_code_check": null,
-                "cvc_check": "pass"
-              },
-              "country": "US",
-              "exp_month": 2,
-              "exp_year": 2025,
-              "extended_authorization": {
-                "status": "disabled"
-              },
-              "fingerprint": "NORMALIZED000001",
-              "funding": "credit",
-              "incremental_authorization": {
-                "status": "unavailable"
-              },
-              "installments": null,
-              "last4": "4242",
-              "mandate": null,
-              "multicapture": {
-                "status": "unavailable"
-              },
-              "network": "visa",
-              "network_token": {
-                "used": false
-              },
-              "overcapture": {
-                "maximum_amount_capturable": 48000,
-                "status": "unavailable"
-              },
-              "three_d_secure": null,
-              "wallet": null
-            },
-            "type": "card"
-          },
-          "radar_options": {},
-          "receipt_email": "hamlet@zulip.com",
-          "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJPlmK4GMgbAEfICm8M6LBb_lV62hGXSuYlRw0c3d-VNaNR0PsiFvmp7PSTmmzEksjJPgDhbbPV4M6YH?s=ap",
-          "refunded": false,
-          "refunds": {
-            "data": [],
-            "has_more": false,
-            "object": "list",
-            "total_count": 0,
-            "url": "/v1/charges/ch_NORMALIZED00000000000002/refunds"
-          },
-          "review": null,
-          "shipping": null,
-          "source": null,
-          "source_transfer": null,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "statement_descriptor_suffix": null,
-          "status": "succeeded",
-          "transfer_data": null,
-          "transfer_group": null
-        }
-      },
-      "id": "evt_3OhuncDEQaroqDjs1QwabFgd",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
-      },
-      "type": "charge.succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhundDEQaroqDjsSovPuEvL",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0004",
-        "idempotency_key": "9a484d37-f817-4aa6-834c-b7114ca823a4"
-      },
-      "type": "invoice.finalized"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        },
-        "previous_attributes": {
-          "effective_at": null,
-          "ending_balance": null,
-          "hosted_invoice_url": null,
-          "invoice_pdf": null,
-          "number": null,
-          "payment_intent": null,
-          "rendering": {
-            "pdf": {
-              "page_size": "auto"
-            }
-          },
-          "status": "draft",
-          "status_transitions": {
-            "finalized_at": null
-          }
-        }
-      },
-      "id": "evt_1OhundDEQaroqDjsYg3moveF",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0004",
-        "idempotency_key": "9a484d37-f817-4aa6-834c-b7114ca823a4"
-      },
-      "type": "invoice.updated"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
+          "amount": 984000,
           "amount_capturable": 0,
           "amount_details": {
             "tip": {}
@@ -1094,8 +208,8 @@
           "application": null,
           "application_fee_amount": null,
           "automatic_payment_methods": null,
-          "canceled_at": null,
-          "cancellation_reason": null,
+          "canceled_at": 1000000000,
+          "cancellation_reason": "requested_by_customer",
           "capture_method": "automatic",
           "charges": {
             "data": [],
@@ -1104,7 +218,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
           },
-          "client_secret": "pi_NORMALIZED00000000000002_secret_r9MqQIHw0FgWT989cYbXBmKar",
+          "client_secret": "pi_NORMALIZED00000000000002_secret_N89QmNV3CuoiQxCpwydcHZ94n",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -1128,11 +242,17 @@
               "network": null,
               "request_three_d_secure": "automatic"
             },
-            "cashapp": {}
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
           },
           "payment_method_types": [
+            "ach_credit_transfer",
             "card",
-            "cashapp"
+            "cashapp",
+            "wechat_pay"
           ],
           "processing": null,
           "receipt_email": "hamlet@zulip.com",
@@ -1142,20 +262,20 @@
           "source": null,
           "statement_descriptor": "Zulip Cloud Standard",
           "statement_descriptor_suffix": null,
-          "status": "requires_payment_method",
+          "status": "canceled",
           "transfer_data": null,
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuncDEQaroqDjs15ikDUSk",
+      "id": "evt_3OqSijDEQaroqDjs0lz5HE0z",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0004",
-        "idempotency_key": "9a484d37-f817-4aa6-834c-b7114ca823a4"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "f5738def-9a15-497d-8d9a-10ccbdca5423"
       },
-      "type": "payment_intent.created"
+      "type": "payment_intent.canceled"
     },
     {
       "api_version": "2020-08-27",
@@ -1165,15 +285,15 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
+          "amount_due": 984000,
           "amount_paid": 0,
-          "amount_remaining": 48000,
+          "amount_remaining": 984000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
           "attempt_count": 0,
           "attempted": false,
-          "auto_advance": false,
+          "auto_advance": true,
           "automatic_tax": {
             "enabled": false,
             "liability": null,
@@ -1181,7 +301,7 @@
           },
           "billing_reason": "manual",
           "charge": null,
-          "collection_method": "charge_automatically",
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -1199,14 +319,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
-          "effective_at": null,
-          "ending_balance": null,
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNQ0200q5JtQRsb?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": null,
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNQ0200q5JtQRsb/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -1215,14 +335,15 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -1238,13 +359,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -1257,7 +378,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 123,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -1273,10 +394,478 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "123",
             "plan_tier": "1",
-            "user_id": "12"
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSikDEQaroqDjshFonzQaU",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bcb1bf47-a0f2-4c33-a160-9914f1a1a9d4"
+      },
+      "type": "invoice.finalized"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNQ0200q5JtQRsb?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNQ0200q5JtQRsb/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "effective_at": null,
+          "ending_balance": null,
+          "hosted_invoice_url": null,
+          "invoice_pdf": null,
+          "number": null,
+          "payment_intent": null,
+          "rendering": {
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null
+          }
+        }
+      },
+      "id": "evt_1OqSijDEQaroqDjsbLEyS9i8",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bcb1bf47-a0f2-4c33-a160-9914f1a1a9d4"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": null,
+          "cancellation_reason": null,
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
+          },
+          "client_secret": "pi_NORMALIZED00000000000002_secret_N89QmNV3CuoiQxCpwydcHZ94n",
+          "confirmation_method": "automatic",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000002",
+          "invoice": "in_NORMALIZED00000000000002",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
+          },
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "requires_payment_method",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSijDEQaroqDjs0V8YVm6T",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bcb1bf47-a0f2-4c33-a160-9914f1a1a9d4"
+      },
+      "type": "payment_intent.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": null,
+          "ending_balance": null,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": null,
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": null,
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
           },
           "next_payment_attempt": null,
           "number": null,
@@ -1318,25 +907,25 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 984000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 984000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuncDEQaroqDjssoOWUs9g",
+      "id": "evt_1OqSiiDEQaroqDjsKTzZ6p62",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0005",
-        "idempotency_key": "fafeeb74-3747-43b0-88c7-b41b4bc0c33c"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "9e7f6a95-4909-4a8c-9911-1a8ea7c6d241"
       },
       "type": "invoice.created"
     },
@@ -1345,7 +934,7 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "amount": 48000,
+          "amount": 984000,
           "currency": "usd",
           "customer": "cus_NORMALIZED0001",
           "date": 1000000000,
@@ -1368,13 +957,13 @@
             "created": 1000000000,
             "currency": "usd",
             "custom_unit_amount": null,
-            "id": "price_NORMALIZED00000000000001",
+            "id": "price_NORMALIZED00000000000002",
             "livemode": false,
             "lookup_key": null,
             "metadata": {},
             "nickname": null,
             "object": "price",
-            "product": "prod_NORMALIZED0001",
+            "product": "prod_NORMALIZED0002",
             "recurring": null,
             "tax_behavior": "unspecified",
             "tiers_mode": null,
@@ -1384,7 +973,7 @@
             "unit_amount_decimal": "8000"
           },
           "proration": false,
-          "quantity": 6,
+          "quantity": 123,
           "subscription": null,
           "tax_rates": [],
           "test_clock": null,
@@ -1392,13 +981,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhunbDEQaroqDjsHwMsI9fS",
+      "id": "evt_1OqSiiDEQaroqDjsSKc2zgN6",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0006",
-        "idempotency_key": "ada964c5-6556-4772-bcc9-e4ac7f97cc83"
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "3009a4cd-a3ef-42c3-98eb-c16f61e0cd74"
       },
       "type": "invoiceitem.created"
     },
@@ -1407,186 +996,103 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
+          "address": null,
+          "balance": 0,
           "created": 1000000000,
           "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
+          "default_currency": "usd",
           "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
           "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
           },
           "livemode": false,
           "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
+            "realm_id": "1",
+            "realm_str": "zulip"
           },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0001",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "currency": null,
+          "default_currency": null
         }
       },
-      "id": "evt_1OhunaDEQaroqDjsFGj3eXCF",
+      "id": "evt_1OqSiiDEQaroqDjsd8LdpaQS",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "95217da2-3c4d-4158-b903-588fb8f1b1ac"
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "3009a4cd-a3ef-42c3-98eb-c16f61e0cd74"
       },
-      "type": "invoice.payment_succeeded"
+      "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": null,
+          "default_currency": null,
+          "default_source": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        }
+      },
+      "id": "evt_1OqSigDEQaroqDjshEB1eaX0",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "ea69c5e7-c2f0-4704-ad8c-518707fc1549"
+      },
+      "type": "customer.created"
     }
   ],
-  "has_more": true,
+  "has_more": false,
   "object": "list",
   "url": "/v1/events"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.8.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.3.json
similarity index 52%
rename from corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.8.json
rename to corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.3.json
index f0349b646d..ee7f008293 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.8.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.3.json
@@ -1,5 +1,115 @@
 {
   "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "ach_credit_transfer": {
+            "account_number": "test_NORMALIZED02",
+            "bank_name": "TEST BANK",
+            "fingerprint": "NORMALIZED000001",
+            "refund_account_holder_name": null,
+            "refund_account_holder_type": null,
+            "refund_routing_number": null,
+            "routing_number": "110000000",
+            "swift_code": "TSTEZ122"
+          },
+          "amount": null,
+          "client_secret": "src_client_secret_NORMALIZED00000000000001",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "flow": "receiver",
+          "id": "src_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "source",
+          "owner": {
+            "address": null,
+            "email": "amount_0@stripe.com",
+            "name": null,
+            "phone": null,
+            "verified_address": null,
+            "verified_email": null,
+            "verified_name": null,
+            "verified_phone": null
+          },
+          "receiver": {
+            "address": "000000000-test_NORMALIZED01",
+            "amount_charged": 0,
+            "amount_received": 0,
+            "amount_returned": 0,
+            "refund_attributes_method": "email",
+            "refund_attributes_status": "missing"
+          },
+          "statement_descriptor": null,
+          "status": "pending",
+          "type": "ach_credit_transfer",
+          "usage": "reusable"
+        }
+      },
+      "id": "evt_1OqSikDEQaroqDjs7gAW6y04",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "a084a388-18bd-4959-9e3f-529be55c4d51"
+      },
+      "type": "customer.source.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": "usd",
+          "default_currency": "usd",
+          "default_source": "src_NORMALIZED00000000000001",
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 2,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "default_source": null
+        }
+      },
+      "id": "evt_1OqSilDEQaroqDjs1sBqjY1f",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "a084a388-18bd-4959-9e3f-529be55c4d51"
+      },
+      "type": "customer.updated"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -8,14 +118,14 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
+          "attempt_count": 0,
+          "attempted": false,
           "auto_advance": false,
           "automatic_tax": {
             "enabled": false,
@@ -23,8 +133,8 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000002",
-          "collection_method": "charge_automatically",
+          "charge": null,
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -42,14 +152,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
+          "due_date": 1000000000,
           "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNg0200N9IRXCg2?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNg0200N9IRXCg2/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -58,14 +168,15 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -81,13 +192,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -100,7 +211,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 123,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -116,18 +227,18 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "123",
             "plan_tier": "1",
-            "user_id": "12"
+            "user_id": "10"
           },
           "next_payment_attempt": null,
           "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
+          "paid_out_of_band": true,
+          "payment_intent": null,
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -161,27 +272,27 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 984000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 984000,
           "total_tax_amounts": [],
           "transfer_data": null,
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhunfDEQaroqDjsCLTcZsHk",
+      "id": "evt_1OqSikDEQaroqDjsj1zNXi65",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "f5738def-9a15-497d-8d9a-10ccbdca5423"
       },
-      "type": "invoice.payment_succeeded"
+      "type": "invoice.paid"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.5.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.4.json
similarity index 100%
rename from corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.5.json
rename to corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.4.json
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.1.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.1.json
index e521b31ff7..286d9d2aa5 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,6 +111,7 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
@@ -163,5 +165,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.2.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.2.json
index df5451bdb8..44f7d11b57 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000003",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 100,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.1.json
index 77de2a30cf..60fbe495fc 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmNTRwQWNyNU00WFJSbW95NGZTY2xKbk52bEM4LDk4MDI4MzQ50200KzFIO3lj?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNQ0200q5JtQRsb?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmNTRwQWNyNU00WFJSbW95NGZTY2xKbk52bEM4LDk4MDI4MzQ50200KzFIO3lj/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNQ0200q5JtQRsb/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,12 +111,13 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.2.json
index 92ffeb62e5..8e6714b04b 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmd25tSHB5dlIxU3dvcGljYzBNR2M2c0JIeEhhLDk4MDI4MzUx0200yq99oZge?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MaFZUMmR2a2VmTFBnYTNrcGU0MDI5c2c4bmxFLDEwMDA2NTcwOQ02002sW1yK2n?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmd25tSHB5dlIxU3dvcGljYzBNR2M2c0JIeEhhLDk4MDI4MzUx0200yq99oZge/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MaFZUMmR2a2VmTFBnYTNrcGU0MDI5c2c4bmxFLDEwMDA2NTcwOQ02002sW1yK2n/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000003",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,7 +111,7 @@
   "livemode": false,
   "metadata": {},
   "next_payment_attempt": null,
-  "number": "NORMALI-0003",
+  "number": "NORMALI-0004",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 100,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.list.1.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.list.1.json
index 7c29624cbf..ae32140cc8 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.list.1.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.list.1.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmd25tSHB5dlIxU3dvcGljYzBNR2M2c0JIeEhhLDk4MDI4MzUx0200yq99oZge?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MaFZUMmR2a2VmTFBnYTNrcGU0MDI5c2c4bmxFLDEwMDA2NTcwOQ02002sW1yK2n?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmd25tSHB5dlIxU3dvcGljYzBNR2M2c0JIeEhhLDk4MDI4MzUx0200yq99oZge/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MaFZUMmR2a2VmTFBnYTNrcGU0MDI5c2c4bmxFLDEwMDA2NTcwOQ02002sW1yK2n/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -77,13 +78,13 @@
               "created": 1000000000,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000003",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0001",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -112,7 +113,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": null,
-      "number": "NORMALI-0003",
+      "number": "NORMALI-0004",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -160,7 +161,7 @@
       "total_excluding_tax": 100,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -174,7 +175,7 @@
       "application_fee_amount": null,
       "attempt_count": 0,
       "attempted": false,
-      "auto_advance": true,
+      "auto_advance": false,
       "automatic_tax": {
         "enabled": false,
         "liability": null,
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmNTRwQWNyNU00WFJSbW95NGZTY2xKbk52bEM4LDk4MDI4MzUx0200pjrUb2Kb?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwOQ0200KCiPzavz?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmNTRwQWNyNU00WFJSbW95NGZTY2xKbk52bEM4LDk4MDI4MzUx0200pjrUb2Kb/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwOQ0200KCiPzavz/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -239,13 +241,13 @@
               "created": 1000000000,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000001",
+              "id": "price_NORMALIZED00000000000002",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0001",
+              "product": "prod_NORMALIZED0002",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -274,17 +276,18 @@
       "livemode": false,
       "metadata": {
         "billing_schedule": "1",
+        "license_management": "manual",
         "licenses": "123",
         "plan_tier": "1",
         "user_id": "10"
       },
       "next_payment_attempt": null,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
-      "paid": false,
-      "paid_out_of_band": false,
-      "payment_intent": "pi_NORMALIZED00000000000002",
+      "paid": true,
+      "paid_out_of_band": true,
+      "payment_intent": null,
       "payment_settings": {
         "default_mandate": null,
         "payment_method_options": null,
@@ -307,11 +310,11 @@
       "shipping_details": null,
       "starting_balance": 0,
       "statement_descriptor": "Zulip Cloud Standard",
-      "status": "open",
+      "status": "paid",
       "status_transitions": {
         "finalized_at": 1000000000,
         "marked_uncollectible_at": null,
-        "paid_at": null,
+        "paid_at": 1000000000,
         "voided_at": null
       },
       "subscription": null,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.2.json b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.pay.1.json
similarity index 79%
rename from corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.2.json
rename to corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.pay.1.json
index 1a06a2344c..afed558ecb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.2.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.pay.1.json
@@ -2,14 +2,14 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 48000,
-  "amount_paid": 48000,
-  "amount_remaining": 0,
+  "amount_due": 984000,
+  "amount_paid": 0,
+  "amount_remaining": 984000,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
-  "attempt_count": 1,
-  "attempted": true,
+  "attempt_count": 0,
+  "attempted": false,
   "auto_advance": false,
   "automatic_tax": {
     "enabled": false,
@@ -17,8 +17,8 @@
     "status": null
   },
   "billing_reason": "manual",
-  "charge": "ch_NORMALIZED00000000000002",
-  "collection_method": "charge_automatically",
+  "charge": null,
+  "collection_method": "send_invoice",
   "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
@@ -36,14 +36,14 @@
   "description": null,
   "discount": null,
   "discounts": [],
-  "due_date": null,
+  "due_date": 1000000000,
   "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNg0200N9IRXCg2?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MR3ZlQXFQWUJwT1k4QkVNb1pVNHFtYURSQkdFLDEwMDA2NTcwNg0200N9IRXCg2/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -52,14 +52,15 @@
   "lines": {
     "data": [
       {
-        "amount": 48000,
-        "amount_excluding_tax": 48000,
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
         "currency": "usd",
         "description": "Zulip Cloud Standard",
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -94,7 +95,7 @@
         "proration_details": {
           "credited_items": null
         },
-        "quantity": 6,
+        "quantity": 123,
         "subscription": null,
         "tax_amounts": [],
         "tax_rates": [],
@@ -110,18 +111,18 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
-    "license_management": "automatic",
-    "licenses": "6",
+    "license_management": "manual",
+    "licenses": "123",
     "plan_tier": "1",
-    "user_id": "12"
+    "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
-  "paid_out_of_band": false,
-  "payment_intent": "pi_NORMALIZED00000000000002",
+  "paid_out_of_band": true,
+  "payment_intent": null,
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
@@ -155,13 +156,13 @@
   "subscription_details": {
     "metadata": null
   },
-  "subtotal": 48000,
-  "subtotal_excluding_tax": 48000,
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
   "tax": null,
   "test_clock": null,
-  "total": 48000,
+  "total": 984000,
   "total_discount_amounts": [],
-  "total_excluding_tax": 48000,
+  "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
   "webhooks_delivered_at": 1000000000
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.1.json
index b55832f0e2..e1df3adcba 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.1.json
@@ -22,13 +22,13 @@
     "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000001",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0001",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.2.json
index 728c7130b2..50b93cb301 100644
--- a/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.2.json
@@ -22,13 +22,13 @@
     "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000002",
+    "id": "price_NORMALIZED00000000000003",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0002",
+    "product": "prod_NORMALIZED0001",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.create.1.json
index f9f5cb6381..3d6b9bc66c 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.create.1.json
@@ -1,7 +1,7 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708574643,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
@@ -9,8 +9,8 @@
   "description": "demo.example.com 6cde5f7a-1f7",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PbgtpRvLU7dw2y",
-  "invoice_prefix": "CE82FB85",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": null,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.modify.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.modify.1.json
index f24ad72920..a53c871aec 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.modify.1.json
@@ -1,7 +1,7 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708574643,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
@@ -9,11 +9,11 @@
   "description": "demo.example.com 6cde5f7a-1f7",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PbgtpRvLU7dw2y",
-  "invoice_prefix": "CE82FB85",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+    "default_payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.1.json
index ff8e652ab1..b88edf49db 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.1.json
@@ -1,7 +1,7 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708574643,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
@@ -9,8 +9,8 @@
   "description": "demo.example.com 6cde5f7a-1f7",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PbgtpRvLU7dw2y",
-  "invoice_prefix": "CE82FB85",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708574645,
-      "customer": "cus_PbgtpRvLU7dw2y",
-      "id": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.2.json
index ff8e652ab1..b88edf49db 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.2.json
@@ -1,7 +1,7 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708574643,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
@@ -9,8 +9,8 @@
   "description": "demo.example.com 6cde5f7a-1f7",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PbgtpRvLU7dw2y",
-  "invoice_prefix": "CE82FB85",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708574645,
-      "customer": "cus_PbgtpRvLU7dw2y",
-      "id": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.3.json
index ff8e652ab1..b88edf49db 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.3.json
@@ -1,7 +1,7 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708574643,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
@@ -9,8 +9,8 @@
   "description": "demo.example.com 6cde5f7a-1f7",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PbgtpRvLU7dw2y",
-  "invoice_prefix": "CE82FB85",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708574645,
-      "customer": "cus_PbgtpRvLU7dw2y",
-      "id": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.4.json
index ff8e652ab1..b88edf49db 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.4.json
@@ -1,7 +1,7 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708574643,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
@@ -9,8 +9,8 @@
   "description": "demo.example.com 6cde5f7a-1f7",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PbgtpRvLU7dw2y",
-  "invoice_prefix": "CE82FB85",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708574645,
-      "customer": "cus_PbgtpRvLU7dw2y",
-      "id": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.5.json
index 9589e51048..fe8532b57f 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.5.json
@@ -1,7 +1,7 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708574643,
+  "created": 1000000000,
   "currency": "usd",
   "default_currency": "usd",
   "default_source": null,
@@ -9,8 +9,8 @@
   "description": "demo.example.com 6cde5f7a-1f7",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PbgtpRvLU7dw2y",
-  "invoice_prefix": "CE82FB85",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708574645,
-      "customer": "cus_PbgtpRvLU7dw2y",
-      "id": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.1.json
index cc07d736e6..84a360f062 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.1.json
@@ -2,12 +2,12 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1708574646,
+      "created": 1000000000,
       "data": {
         "object": {
           "address": null,
           "balance": 0,
-          "created": 1708574643,
+          "created": 1000000000,
           "currency": null,
           "default_currency": null,
           "default_source": null,
@@ -15,11 +15,11 @@
           "description": "demo.example.com 6cde5f7a-1f7",
           "discount": null,
           "email": "hamlet@zulip.com",
-          "id": "cus_PbgtpRvLU7dw2y",
-          "invoice_prefix": "CE82FB85",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+            "default_payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OmTVyDEQaroqDjs0kzvdGzA",
+      "id": "evt_1OqSrFDEQaroqDjszpIvZ1Fa",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NUorH7PLSlHBBY",
-        "idempotency_key": "260de422-5ad7-42f4-b4a7-5882696a655f"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "88731363-c985-46b0-add2-fbc0e999a74d"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.2.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.2.json
index 4a4ef298ac..6c0f108d6a 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.2.json
@@ -2,7 +2,7 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1708574653,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": 4300,
@@ -26,7 +26,7 @@
                 "application": null,
                 "application_fee": null,
                 "application_fee_amount": null,
-                "balance_transaction": "txn_3OmTW2DEQaroqDjs0q8IIZDA",
+                "balance_transaction": "txn_NORMALIZED00000000000001",
                 "billing_details": {
                   "address": {
                     "city": null,
@@ -42,9 +42,9 @@
                 },
                 "calculated_statement_descriptor": "ZULIP BASIC",
                 "captured": true,
-                "created": 1708574652,
+                "created": 1000000000,
                 "currency": "usd",
-                "customer": "cus_PbgtpRvLU7dw2y",
+                "customer": "cus_NORMALIZED0001",
                 "description": "Payment for Invoice",
                 "destination": null,
                 "dispute": null,
@@ -53,8 +53,8 @@
                 "failure_code": null,
                 "failure_message": null,
                 "fraud_details": {},
-                "id": "ch_3OmTW2DEQaroqDjs0JhLZpBZ",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
+                "id": "ch_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "charge",
@@ -64,13 +64,13 @@
                   "network_status": "approved_by_network",
                   "reason": null,
                   "risk_level": "normal",
-                  "risk_score": 50,
+                  "risk_score": 0,
                   "seller_message": "Payment complete.",
                   "type": "authorized"
                 },
                 "paid": true,
-                "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
-                "payment_method": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+                "payment_intent": "pi_NORMALIZED00000000000001",
+                "payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 4300,
@@ -81,12 +81,12 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
                     },
-                    "fingerprint": "9XKsMixKBi6kIIzd",
+                    "fingerprint": "NORMALIZED000001",
                     "funding": "credit",
                     "incremental_authorization": {
                       "status": "unavailable"
@@ -113,14 +113,14 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKL2P264GMgbnCVcM0YU6LBa3Z-u0eDoKXCA8Caz9OMr1QAmBM2nMpQUYdA170RudshYisr3kmcov1ciL?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKL-Tla8GMgZRgDakqMQ6LBbVb7I60CwPzHoG77BKdcEG8Bqhajo6ZTgeEaTWvm78pmAwksyXNi7uPNdn?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
                   "has_more": false,
                   "object": "list",
                   "total_count": 0,
-                  "url": "/v1/charges/ch_3OmTW2DEQaroqDjs0JhLZpBZ/refunds"
+                  "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
                 },
                 "review": null,
                 "shipping": null,
@@ -136,24 +136,24 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/charges?payment_intent=pi_3OmTW2DEQaroqDjs06cY7wx8"
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_3OmTW2DEQaroqDjs06cY7wx8_secret_cCYl984T16p3RocGv0CR4L4hr",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_MCqA9Y3lewgWj9ktQJlylrrnx",
           "confirmation_method": "automatic",
-          "created": 1708574650,
+          "created": 1000000000,
           "currency": "usd",
-          "customer": "cus_PbgtpRvLU7dw2y",
+          "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
-          "id": "pi_3OmTW2DEQaroqDjs06cY7wx8",
-          "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
           "last_payment_error": null,
-          "latest_charge": "ch_3OmTW2DEQaroqDjs0JhLZpBZ",
+          "latest_charge": "ch_NORMALIZED00000000000001",
           "livemode": false,
           "metadata": {},
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+          "payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,19 +181,147 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OmTW2DEQaroqDjs0Dbd1Q5W",
+      "id": "evt_3OqSrJDEQaroqDjs0PhHXjjy",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
-        "id": "req_IRkeaSVXnoyEy6",
-        "idempotency_key": "e5794a90-7ce9-4b61-ab21-2b1b12f9bf5f"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "7fcfa010-9e02-49b3-bc96-561edaedac06"
       },
       "type": "payment_intent.succeeded"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574650,
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 4300,
+          "amount_captured": 4300,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 4300,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 4300,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKL-Tla8GMgZL-AZBcB86LBbYggxKX534MgVA8aE5Ay3q_kIvEi9hlc2KIBQlUoZQOA4qxGhckgLTykWc?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSrJDEQaroqDjs0gQFpzq2",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "7fcfa010-9e02-49b3-bc96-561edaedac06"
+      },
+      "type": "charge.succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -216,10 +344,10 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1708574649,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PbgtpRvLU7dw2y",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -234,13 +362,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708574650,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUx02009heDswuh?s=ap",
-          "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUx02009heDswuh/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzNw0200HsHfCnZW?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzNw0200HsHfCnZW/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -256,30 +384,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1704886320,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PLhPbuhP0lDy6A",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -307,30 +435,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1702995208,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OP432DEQaroqDjsMeew3eg5",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -354,7 +482,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 2,
-            "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -364,19 +492,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "CE82FB85-0001",
+          "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708574649,
-          "period_start": 1708574649,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -394,7 +522,7 @@
           "statement_descriptor": "Zulip Basic",
           "status": "open",
           "status_transitions": {
-            "finalized_at": 1708574650,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
             "paid_at": null,
             "voided_at": null
@@ -412,22 +540,22 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OmTW3DEQaroqDjs3MQXpk1m",
+      "id": "evt_1OqSrJDEQaroqDjsBwzNEU0a",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_bpTTnLloxTSXrj",
-        "idempotency_key": "3fe1f219-8245-4621-879a-8df4eb51ec18"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "4ab6ae80-9003-4a16-933a-ecbee0158515"
       },
       "type": "invoice.finalized"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574650,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -450,10 +578,10 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1708574649,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PbgtpRvLU7dw2y",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -468,13 +596,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708574650,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUx02009heDswuh?s=ap",
-          "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUx02009heDswuh/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzNw0200HsHfCnZW?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzNw0200HsHfCnZW/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -490,30 +618,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1704886320,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PLhPbuhP0lDy6A",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -541,30 +669,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1702995208,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OP432DEQaroqDjsMeew3eg5",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -588,7 +716,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 2,
-            "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -598,19 +726,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "CE82FB85-0001",
+          "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708574649,
-          "period_start": 1708574649,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -628,7 +756,7 @@
           "statement_descriptor": "Zulip Basic",
           "status": "open",
           "status_transitions": {
-            "finalized_at": 1708574650,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
             "paid_at": null,
             "voided_at": null
@@ -646,7 +774,7 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -666,19 +794,19 @@
           }
         }
       },
-      "id": "evt_1OmTW3DEQaroqDjsGPan8tQ6",
+      "id": "evt_1OqSrJDEQaroqDjsPF1ZPPBu",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_bpTTnLloxTSXrj",
-        "idempotency_key": "3fe1f219-8245-4621-879a-8df4eb51ec18"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "4ab6ae80-9003-4a16-933a-ecbee0158515"
       },
       "type": "invoice.updated"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574650,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": 4300,
@@ -698,16 +826,16 @@
             "has_more": false,
             "object": "list",
             "total_count": 0,
-            "url": "/v1/charges?payment_intent=pi_3OmTW2DEQaroqDjs06cY7wx8"
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_3OmTW2DEQaroqDjs06cY7wx8_secret_cCYl984T16p3RocGv0CR4L4hr",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_MCqA9Y3lewgWj9ktQJlylrrnx",
           "confirmation_method": "automatic",
-          "created": 1708574650,
+          "created": 1000000000,
           "currency": "usd",
-          "customer": "cus_PbgtpRvLU7dw2y",
+          "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
-          "id": "pi_3OmTW2DEQaroqDjs06cY7wx8",
-          "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
           "last_payment_error": null,
           "latest_charge": null,
           "livemode": false,
@@ -743,19 +871,19 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OmTW2DEQaroqDjs0WY2U9va",
+      "id": "evt_3OqSrJDEQaroqDjs0WO7zybJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_bpTTnLloxTSXrj",
-        "idempotency_key": "3fe1f219-8245-4621-879a-8df4eb51ec18"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "4ab6ae80-9003-4a16-933a-ecbee0158515"
       },
       "type": "payment_intent.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574650,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -778,10 +906,10 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1708574649,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PbgtpRvLU7dw2y",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -801,7 +929,7 @@
           "footer": null,
           "from_invoice": null,
           "hosted_invoice_url": null,
-          "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
+          "id": "in_NORMALIZED00000000000001",
           "invoice_pdf": null,
           "issuer": {
             "type": "self"
@@ -818,30 +946,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1704886320,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PLhPbuhP0lDy6A",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -869,30 +997,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1702995208,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OP432DEQaroqDjsMeew3eg5",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -916,7 +1044,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 2,
-            "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -937,8 +1065,8 @@
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708574649,
-          "period_start": 1708574649,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -974,54 +1102,54 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OmTW2DEQaroqDjstAdcSpYl",
+      "id": "evt_1OqSrIDEQaroqDjsZhsK8tIJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_YiRGgSs1veUiuK",
-        "idempotency_key": "d3476951-1dd4-48f0-b936-4eded769120c"
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "7ec06b0f-b6ab-45ee-bfe1-cd14578b1735"
       },
       "type": "invoice.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574649,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": -2000,
           "currency": "usd",
-          "customer": "cus_PbgtpRvLU7dw2y",
-          "date": 1708574649,
+          "customer": "cus_NORMALIZED0001",
+          "date": 1000000000,
           "description": "$20.00/month new customer discount",
           "discountable": false,
           "discounts": [],
-          "id": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+          "id": "ii_NORMALIZED00000000000001",
           "invoice": null,
           "livemode": false,
           "metadata": {},
           "object": "invoiceitem",
           "period": {
-            "end": 1708574649,
-            "start": 1708574649
+            "end": 1000000000,
+            "start": 1000000000
           },
           "plan": null,
           "price": {
             "active": false,
             "billing_scheme": "per_unit",
-            "created": 1704886320,
+            "created": 1000000000,
             "currency": "usd",
             "custom_unit_amount": null,
-            "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+            "id": "price_NORMALIZED00000000000001",
             "livemode": false,
             "lookup_key": null,
             "metadata": {},
             "nickname": null,
             "object": "price",
-            "product": "prod_PLhPbuhP0lDy6A",
+            "product": "prod_NORMALIZED0001",
             "recurring": null,
             "tax_behavior": "unspecified",
             "tiers_mode": null,
@@ -1039,51 +1167,51 @@
           "unit_amount_decimal": "-2000"
         }
       },
-      "id": "evt_1OmTW1DEQaroqDjswMxTLizE",
+      "id": "evt_1OqSrIDEQaroqDjsY0kRn2FG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_2g4EYkB2vggL8e",
-        "idempotency_key": "17c05851-c9fd-4742-a1ea-2e0611da1037"
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "5be921b1-9f8d-47a6-9e2f-8a66e8c3539e"
       },
       "type": "invoiceitem.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574649,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": 6300,
           "currency": "usd",
-          "customer": "cus_PbgtpRvLU7dw2y",
-          "date": 1708574649,
+          "customer": "cus_NORMALIZED0001",
+          "date": 1000000000,
           "description": "Zulip Basic",
           "discountable": false,
           "discounts": [],
-          "id": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+          "id": "ii_NORMALIZED00000000000002",
           "invoice": null,
           "livemode": false,
           "metadata": {},
           "object": "invoiceitem",
           "period": {
-            "end": 1708574649,
-            "start": 1708574649
+            "end": 1000000000,
+            "start": 1000000000
           },
           "plan": null,
           "price": {
             "active": false,
             "billing_scheme": "per_unit",
-            "created": 1702995208,
+            "created": 1000000000,
             "currency": "usd",
             "custom_unit_amount": null,
-            "id": "price_1OP432DEQaroqDjsMeew3eg5",
+            "id": "price_NORMALIZED00000000000002",
             "livemode": false,
             "lookup_key": null,
             "metadata": {},
             "nickname": null,
             "object": "price",
-            "product": "prod_PDUwJ9ZgTQzjad",
+            "product": "prod_NORMALIZED0002",
             "recurring": null,
             "tax_behavior": "unspecified",
             "tiers_mode": null,
@@ -1101,24 +1229,24 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1OmTW1DEQaroqDjsY8TtM7UK",
+      "id": "evt_1OqSrIDEQaroqDjsTS9xxxhU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_3WOtOqqt0MrSx9",
-        "idempotency_key": "9f7d495e-c787-402e-a904-6af779480714"
+        "id": "req_NORMALIZED0006",
+        "idempotency_key": "9fc179c0-d5ce-496a-9170-47b1e4b91a29"
       },
       "type": "invoiceitem.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574649,
+      "created": 1000000000,
       "data": {
         "object": {
           "address": null,
           "balance": 0,
-          "created": 1708574643,
+          "created": 1000000000,
           "currency": "usd",
           "default_currency": "usd",
           "default_source": null,
@@ -1126,11 +1254,11 @@
           "description": "demo.example.com 6cde5f7a-1f7",
           "discount": null,
           "email": "hamlet@zulip.com",
-          "id": "cus_PbgtpRvLU7dw2y",
-          "invoice_prefix": "CE82FB85",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+            "default_payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
             "footer": null,
             "rendering_options": null
           },
@@ -1153,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OmTW1DEQaroqDjsoaB9Otk8",
+      "id": "evt_1OqSrHDEQaroqDjsNBPxZhQZ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_3WOtOqqt0MrSx9",
-        "idempotency_key": "9f7d495e-c787-402e-a904-6af779480714"
+        "id": "req_NORMALIZED0006",
+        "idempotency_key": "9fc179c0-d5ce-496a-9170-47b1e4b91a29"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.3.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.3.json
index 8ed630ad58..6a019400af 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.3.json
@@ -2,7 +2,7 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1708574653,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -23,12 +23,12 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_3OmTW2DEQaroqDjs0JhLZpBZ",
+          "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1708574649,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PbgtpRvLU7dw2y",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -43,13 +43,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708574650,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDU00200cu8gv92d?s=ap",
-          "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDU00200cu8gv92d/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -65,30 +65,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1704886320,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PLhPbuhP0lDy6A",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -116,30 +116,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1702995208,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OP432DEQaroqDjsMeew3eg5",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -163,7 +163,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 2,
-            "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -173,19 +173,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "CE82FB85-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708574649,
-          "period_start": 1708574649,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -203,9 +203,9 @@
           "statement_descriptor": "Zulip Basic",
           "status": "paid",
           "status_transitions": {
-            "finalized_at": 1708574650,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
-            "paid_at": 1708574652,
+            "paid_at": 1000000000,
             "voided_at": null
           },
           "subscription": null,
@@ -221,22 +221,256 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": 1708574650
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OmTW6DEQaroqDjsqzcK4Khs",
+      "id": "evt_1OqSrLDEQaroqDjsKOfDZ2fB",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
-        "id": "req_IRkeaSVXnoyEy6",
-        "idempotency_key": "e5794a90-7ce9-4b61-ab21-2b1b12f9bf5f"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "7fcfa010-9e02-49b3-bc96-561edaedac06"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 4300,
+          "amount_paid": 4300,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 6300,
+                "amount_excluding_tax": 6300,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 18,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 4300,
+          "subtotal_excluding_tax": 4300,
+          "tax": null,
+          "test_clock": null,
+          "total": 4300,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 4300,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSrLDEQaroqDjs8CE7tBSe",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "7fcfa010-9e02-49b3-bc96-561edaedac06"
       },
       "type": "invoice.paid"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708574653,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -257,12 +491,12 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_3OmTW2DEQaroqDjs0JhLZpBZ",
+          "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1708574649,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PbgtpRvLU7dw2y",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -277,13 +511,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708574650,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDU00200cu8gv92d?s=ap",
-          "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDU00200cu8gv92d/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -299,30 +533,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1704886320,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PLhPbuhP0lDy6A",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -350,30 +584,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1702995208,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1OP432DEQaroqDjsMeew3eg5",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -397,7 +631,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 2,
-            "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -407,19 +641,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "CE82FB85-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708574649,
-          "period_start": 1708574649,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -437,9 +671,9 @@
           "statement_descriptor": "Zulip Basic",
           "status": "paid",
           "status_transitions": {
-            "finalized_at": 1708574650,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
-            "paid_at": 1708574652,
+            "paid_at": 1000000000,
             "voided_at": null
           },
           "subscription": null,
@@ -455,7 +689,7 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": 1708574650
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -470,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OmTW6DEQaroqDjszIxPnptf",
+      "id": "evt_1OqSrLDEQaroqDjse2vKi5DB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_IRkeaSVXnoyEy6",
-        "idempotency_key": "e5794a90-7ce9-4b61-ab21-2b1b12f9bf5f"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "7fcfa010-9e02-49b3-bc96-561edaedac06"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.4.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.4.json
index 8fcbc7d4b8..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.4.json
@@ -1,240 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1708574653,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 4300,
-          "amount_paid": 4300,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_3OmTW2DEQaroqDjs0JhLZpBZ",
-          "collection_method": "charge_automatically",
-          "created": 1708574649,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_PbgtpRvLU7dw2y",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1708574650,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDU00200cu8gv92d?s=ap",
-          "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDU00200cu8gv92d/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1704886320,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_1OX00qDEQaroqDjst0aTUdZR",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_PLhPbuhP0lDy6A",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 6300,
-                "amount_excluding_tax": 6300,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-                "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-                "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1708574649,
-                  "start": 1708574649
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1702995208,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_1OP432DEQaroqDjsMeew3eg5",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 18,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "CE82FB85-0001",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1708574649,
-          "period_start": 1708574649,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1708574650,
-            "marked_uncollectible_at": null,
-            "paid_at": 1708574652,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 4300,
-          "subtotal_excluding_tax": 4300,
-          "tax": null,
-          "test_clock": null,
-          "total": 4300,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 4300,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1708574650
-        }
-      },
-      "id": "evt_1OmTW6DEQaroqDjsrBga4vLT",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_IRkeaSVXnoyEy6",
-        "idempotency_key": "e5794a90-7ce9-4b61-ab21-2b1b12f9bf5f"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.create.1.json
index 0b30b9a339..f2ec80f992 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.create.1.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708574649,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PbgtpRvLU7dw2y",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
+  "id": "in_NORMALIZED00000000000001",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,30 +59,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-        "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-        "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708574649,
-          "start": 1708574649
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1704886320,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PLhPbuhP0lDy6A",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,30 +110,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-        "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-        "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708574649,
-          "start": 1708574649
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1702995208,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1OP432DEQaroqDjsMeew3eg5",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PDUwJ9ZgTQzjad",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -157,7 +157,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 2,
-    "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
@@ -178,8 +178,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708574649,
-  "period_start": 1708574649,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -215,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.finalize_invoice.1.json
index 39f18ce4ce..6c9a1e8883 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.finalize_invoice.1.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708574649,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PbgtpRvLU7dw2y",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708574650,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUx02009heDswuh?s=ap",
-  "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUx02009heDswuh/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzNw0200HsHfCnZW?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzNw0200HsHfCnZW/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,30 +59,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-        "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-        "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708574649,
-          "start": 1708574649
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1704886320,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PLhPbuhP0lDy6A",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,30 +110,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-        "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-        "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708574649,
-          "start": 1708574649
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1702995208,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1OP432DEQaroqDjsMeew3eg5",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PDUwJ9ZgTQzjad",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -157,7 +157,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 2,
-    "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
@@ -167,19 +167,19 @@
     "plan_tier": "103"
   },
   "next_payment_attempt": null,
-  "number": "CE82FB85-0001",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
+  "payment_intent": "pi_NORMALIZED00000000000001",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708574649,
-  "period_start": 1708574649,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -197,7 +197,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708574650,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -215,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.pay.1.json
index 74a6e0055d..9832ae9062 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.pay.1.json
@@ -17,12 +17,12 @@
     "status": null
   },
   "billing_reason": "manual",
-  "charge": "ch_3OmTW2DEQaroqDjs0JhLZpBZ",
+  "charge": "ch_NORMALIZED00000000000001",
   "collection_method": "charge_automatically",
-  "created": 1708574649,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PbgtpRvLU7dw2y",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708574650,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUz0200Zlz7cHI6?s=ap",
-  "id": "in_1OmTW1DEQaroqDjspHLgWNFX",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QYmd0NURPMDcwMkVvRGk5VTY2dmFPQUYwSkV3NkZ2LDk5MTE1NDUz0200Zlz7cHI6/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VYmVLZ1I2eEl2MXg5akVmQlhwZUNJSWVFSm15LDEwMDA2NjIzOQ0200y2PuUebl/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,30 +59,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1OmTW1DEQaroqDjsC6oWJTrH",
-        "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-        "invoice_item": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708574649,
-          "start": 1708574649
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1704886320,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PLhPbuhP0lDy6A",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,30 +110,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1OmTW2DEQaroqDjsKycfOgbF",
-        "invoice": "in_1OmTW1DEQaroqDjspHLgWNFX",
-        "invoice_item": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708574649,
-          "start": 1708574649
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1702995208,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1OP432DEQaroqDjsMeew3eg5",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PDUwJ9ZgTQzjad",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -157,7 +157,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 2,
-    "url": "/v1/invoices/in_1OmTW1DEQaroqDjspHLgWNFX/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
@@ -167,19 +167,19 @@
     "plan_tier": "103"
   },
   "next_payment_attempt": null,
-  "number": "CE82FB85-0001",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3OmTW2DEQaroqDjs06cY7wx8",
+  "payment_intent": "pi_NORMALIZED00000000000001",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708574649,
-  "period_start": 1708574649,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -197,9 +197,9 @@
   "statement_descriptor": "Zulip Basic",
   "status": "paid",
   "status_transitions": {
-    "finalized_at": 1708574650,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
-    "paid_at": 1708574652,
+    "paid_at": 1000000000,
     "voided_at": null
   },
   "subscription": null,
@@ -215,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708574650
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.1.json
index a1d4d901a3..12dc466795 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.1.json
@@ -1,34 +1,34 @@
 {
   "amount": 6300,
   "currency": "usd",
-  "customer": "cus_PbgtpRvLU7dw2y",
-  "date": 1708574649,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1OmTW1DEQaroqDjsWpzVeBTI",
+  "id": "ii_NORMALIZED00000000000002",
   "invoice": null,
   "livemode": false,
   "metadata": {},
   "object": "invoiceitem",
   "period": {
-    "end": 1708574649,
-    "start": 1708574649
+    "end": 1000000000,
+    "start": 1000000000
   },
   "plan": null,
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1702995208,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1OP432DEQaroqDjsMeew3eg5",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PDUwJ9ZgTQzjad",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.2.json
index bfcae2e1fa..242630a631 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.2.json
@@ -1,34 +1,34 @@
 {
   "amount": -2000,
   "currency": "usd",
-  "customer": "cus_PbgtpRvLU7dw2y",
-  "date": 1708574649,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "$20.00/month new customer discount",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1OmTW1DEQaroqDjsD0TgVZRd",
+  "id": "ii_NORMALIZED00000000000001",
   "invoice": null,
   "livemode": false,
   "metadata": {},
   "object": "invoiceitem",
   "period": {
-    "end": 1708574649,
-    "start": 1708574649
+    "end": 1000000000,
+    "start": 1000000000
   },
   "plan": null,
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1704886320,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1OX00qDEQaroqDjst0aTUdZR",
+    "id": "price_NORMALIZED00000000000001",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PLhPbuhP0lDy6A",
+    "product": "prod_NORMALIZED0001",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.create.1.json
index f809ca4dc7..3f686f21eb 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OmTVxDEQaroqDjs0hVfAEnU_secret_PbgtNyb9b26hwn2mQjnCzuFQG62bPX7",
-  "created": 1708574645,
-  "customer": "cus_PbgtpRvLU7dw2y",
+  "client_secret": "seti_1OqSrDDEQaroqDjsjWSW17L0_secret_PfoUbhxeFvbg8It1X8AiSNdXfCNImap",
+  "created": 1000000000,
+  "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OmTVxDEQaroqDjs0hVfAEnU",
+  "id": "seti_1OqSrDDEQaroqDjsjWSW17L0",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OmTVxDEQaroqDjsQvzeI8Il",
+  "latest_attempt": "setatt_1OqSrEDEQaroqDjsWfpGwNeA",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+  "payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.list.1.json
index 705ebc03b2..7f7b05818d 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OmTVwDEQaroqDjsSzwj9MoK_secret_Pbgtg21v1ixzkjLBM5jcg5fQnBfWSUR",
-      "created": 1708574644,
-      "customer": "cus_PbgtpRvLU7dw2y",
+      "client_secret": "seti_1OqSrDDEQaroqDjskz65gKAM_secret_PfoUW7aKN9wRjf2pNJO3oxZgwEC7CuL",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OmTVwDEQaroqDjsSzwj9MoK",
+      "id": "seti_1OqSrDDEQaroqDjskz65gKAM",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.retrieve.1.json
index f809ca4dc7..3f686f21eb 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OmTVxDEQaroqDjs0hVfAEnU_secret_PbgtNyb9b26hwn2mQjnCzuFQG62bPX7",
-  "created": 1708574645,
-  "customer": "cus_PbgtpRvLU7dw2y",
+  "client_secret": "seti_1OqSrDDEQaroqDjsjWSW17L0_secret_PfoUbhxeFvbg8It1X8AiSNdXfCNImap",
+  "created": 1000000000,
+  "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OmTVxDEQaroqDjs0hVfAEnU",
+  "id": "seti_1OqSrDDEQaroqDjsjWSW17L0",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OmTVxDEQaroqDjsQvzeI8Il",
+  "latest_attempt": "setatt_1OqSrEDEQaroqDjsWfpGwNeA",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OmTVwDEQaroqDjsJyP28EtN",
+  "payment_method": "pm_1OqSrDDEQaroqDjsgjyqCI9X",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.create.1.json
index 62005867f0..c2665a0e03 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1708574644,
+  "created": 1000000000,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -24,7 +24,7 @@
     "submit": null,
     "terms_of_service_acceptance": null
   },
-  "customer": "cus_PbgtpRvLU7dw2y",
+  "customer": "cus_NORMALIZED0001",
   "customer_creation": null,
   "customer_details": {
     "address": null,
@@ -35,14 +35,14 @@
     "tax_ids": null
   },
   "customer_email": null,
-  "expires_at": 1708661044,
-  "id": "cs_test_c1UqAKnkSWSP6qzkLbuI9WBn96e6eWLLcKXGW0ZyOpk9Wp3Bys630PIJX7",
+  "expires_at": 1000000000,
+  "id": "cs_test_NORMALIZED02PKIwLlGSrHmgn6znPmcSgP61gm5I4CGZCYlc29jmpTU34C",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "1",
+    "remote_server_user_id": "3",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OmTVwDEQaroqDjsSzwj9MoK",
+  "setup_intent": "seti_1OqSrDDEQaroqDjskz65gKAM",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_c1UqAKnkSWSP6qzkLbuI9WBn96e6eWLLcKXGW0ZyOpk9Wp3Bys630PIJX7#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02PKIwLlGSrHmgn6znPmcSgP61gm5I4CGZCYlc29jmpTU34C#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.list.1.json
index daeee15a0e..8042210139 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1708574644,
+      "created": 1000000000,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -26,7 +26,7 @@
         "submit": null,
         "terms_of_service_acceptance": null
       },
-      "customer": "cus_PbgtpRvLU7dw2y",
+      "customer": "cus_NORMALIZED0001",
       "customer_creation": null,
       "customer_details": {
         "address": null,
@@ -37,14 +37,14 @@
         "tax_ids": null
       },
       "customer_email": null,
-      "expires_at": 1708661044,
-      "id": "cs_test_c1UqAKnkSWSP6qzkLbuI9WBn96e6eWLLcKXGW0ZyOpk9Wp3Bys630PIJX7",
+      "expires_at": 1000000000,
+      "id": "cs_test_NORMALIZED02PKIwLlGSrHmgn6znPmcSgP61gm5I4CGZCYlc29jmpTU34C",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "1",
+        "remote_server_user_id": "3",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OmTVwDEQaroqDjsSzwj9MoK",
+      "setup_intent": "seti_1OqSrDDEQaroqDjskz65gKAM",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_c1UqAKnkSWSP6qzkLbuI9WBn96e6eWLLcKXGW0ZyOpk9Wp3Bys630PIJX7#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02PKIwLlGSrHmgn6znPmcSgP61gm5I4CGZCYlc29jmpTU34C#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.modify.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.modify.1.json
index 53d023ce51..35d68702c9 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+    "default_payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.1.json
index 82a47be188..22fda9890b 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.1.json
@@ -36,7 +36,7 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -55,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+      "id": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.2.json
index 82a47be188..22fda9890b 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.2.json
@@ -36,7 +36,7 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -55,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+      "id": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.3.json
index 82a47be188..22fda9890b 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.3.json
@@ -36,7 +36,7 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -55,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+      "id": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.4.json
index 82a47be188..22fda9890b 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.4.json
@@ -36,7 +36,7 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -55,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+      "id": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.5.json
index 6e3e5fea10..b2b24b9a5f 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.5.json
@@ -36,7 +36,7 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -55,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+      "id": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.1.json
index 6ec01fdc81..5e0a05b36a 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+            "default_payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OmTnODEQaroqDjsGUYUPrmf",
+      "id": "evt_1OqSrRDEQaroqDjsGwKsZFiH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "aaad3614-65b9-4532-ab8f-3dac86502c6d"
+        "idempotency_key": "24e55147-14e1-4d5d-8ab7-e1701f40d0d2"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.2.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.2.json
index a5e7f51eae..3ef240cd59 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+                "payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 4300,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKPSX264GMgbKSPGLKnA6LBZi23xVzWBbAMR5tyXU0ZpcmGJebwBj2lvYaMLLewXSQMZqGfuWxJN1E3ry?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMuTla8GMgYtwE_Fi2M6LBZMX_hNgLfD_Do_SERgjqXV21KxfPKsUdp-vR2yCynyfgfrQGSu6lPxNddp?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_ZUDoff9kiNkJzGbnuLTTgZLKu",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_pEMs6o5Kniwp3uQhzJO2eOCz2",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+          "payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OmTnSDEQaroqDjs0kruWvxP",
+      "id": "evt_3OqSrVDEQaroqDjs1kJbvJ5G",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "29906042-b934-42b5-9c9b-10ba955641d0"
+        "idempotency_key": "0f92d8b9-cb80-419b-9898-37046ebb68ae"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 4300,
+          "amount_captured": 4300,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 4300,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 4300,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMuTla8GMgaXuwAmU_Y6LBb8em47LkxA7Xi9yzWUtUM9mLBBQJ1DUH6U0o78wmWKRlnkhPFGF0fgcnSa?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSrVDEQaroqDjs1JzUZRxL",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "0f92d8b9-cb80-419b-9898-37046ebb68ae"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMw0200kRUVZYHN?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI0OQ0200awvFeJgq?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMw0200kRUVZYHN/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI0OQ0200awvFeJgq/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -412,16 +540,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OmTnSDEQaroqDjsEoNzrQeY",
+      "id": "evt_1OqSrVDEQaroqDjswITvGBkr",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "7176fd98-a08f-45f5-9e56-c8be8049b1ee"
+        "idempotency_key": "2a76d7e5-515e-4ea2-b777-ccf9a1afab45"
       },
       "type": "invoice.finalized"
     },
@@ -472,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMw0200kRUVZYHN?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI0OQ0200awvFeJgq?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMw0200kRUVZYHN/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI0OQ0200awvFeJgq/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -646,7 +774,7 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -666,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OmTnSDEQaroqDjsfJh0duNX",
+      "id": "evt_1OqSrVDEQaroqDjsrF7APq3t",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "7176fd98-a08f-45f5-9e56-c8be8049b1ee"
+        "idempotency_key": "2a76d7e5-515e-4ea2-b777-ccf9a1afab45"
       },
       "type": "invoice.updated"
     },
@@ -700,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_ZUDoff9kiNkJzGbnuLTTgZLKu",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_pEMs6o5Kniwp3uQhzJO2eOCz2",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -743,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OmTnSDEQaroqDjs01trj5nt",
+      "id": "evt_3OqSrVDEQaroqDjs1RrkxqNe",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "7176fd98-a08f-45f5-9e56-c8be8049b1ee"
+        "idempotency_key": "2a76d7e5-515e-4ea2-b777-ccf9a1afab45"
       },
       "type": "payment_intent.created"
     },
@@ -974,16 +1102,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OmTnRDEQaroqDjs2cjkxUQH",
+      "id": "evt_1OqSrUDEQaroqDjshSnIOG2E",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "83d05827-b023-420d-abcb-d9991cc514a4"
+        "idempotency_key": "18f7af29-fd7e-41b9-bcd6-d2d383325a0a"
       },
       "type": "invoice.created"
     },
@@ -1039,13 +1167,13 @@
           "unit_amount_decimal": "-2000"
         }
       },
-      "id": "evt_1OmTnRDEQaroqDjsTvBynnu4",
+      "id": "evt_1OqSrUDEQaroqDjsz0SJDxiA",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "a3142a65-946f-4107-82ad-cfbc956cc9ab"
+        "idempotency_key": "4b6dbb24-6ab7-4657-9f8b-3a78bc91633d"
       },
       "type": "invoiceitem.created"
     },
@@ -1101,13 +1229,13 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1OmTnQDEQaroqDjsYu5SxKGQ",
+      "id": "evt_1OqSrUDEQaroqDjsAyKcLUSs",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "f565be8e-724a-4a5b-9c6b-f5746e9a5dfb"
+        "idempotency_key": "170fdea6-b924-4dc1-b3ea-7652887caca6"
       },
       "type": "invoiceitem.created"
     },
@@ -1130,7 +1258,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+            "default_payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
             "footer": null,
             "rendering_options": null
           },
@@ -1153,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OmTnQDEQaroqDjspLw3lxpT",
+      "id": "evt_1OqSrTDEQaroqDjsDc8yXdp2",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "f565be8e-724a-4a5b-9c6b-f5746e9a5dfb"
+        "idempotency_key": "170fdea6-b924-4dc1-b3ea-7652887caca6"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.3.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.3.json
index 30345b0325..3dc79e46bf 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMz0200noOCGhEX?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMz0200noOCGhEX/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -224,13 +224,247 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OmTnVDEQaroqDjswuHlifKh",
+      "id": "evt_1OqSrXDEQaroqDjsbV0eIVCc",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "29906042-b934-42b5-9c9b-10ba955641d0"
+        "idempotency_key": "0f92d8b9-cb80-419b-9898-37046ebb68ae"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 4300,
+          "amount_paid": 4300,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 6300,
+                "amount_excluding_tax": 6300,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 18,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 4300,
+          "subtotal_excluding_tax": 4300,
+          "tax": null,
+          "test_clock": null,
+          "total": 4300,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 4300,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSrXDEQaroqDjsNSq7EXwY",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "0f92d8b9-cb80-419b-9898-37046ebb68ae"
       },
       "type": "invoice.paid"
     },
@@ -281,9 +515,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMz0200noOCGhEX?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMz0200noOCGhEX/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -470,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OmTnVDEQaroqDjsJfujbbkw",
+      "id": "evt_1OqSrXDEQaroqDjsNJWvD6jb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "29906042-b934-42b5-9c9b-10ba955641d0"
+        "idempotency_key": "0f92d8b9-cb80-419b-9898-37046ebb68ae"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.4.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.4.json
index 2cb9edc25f..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.4.json
@@ -1,240 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 4300,
-          "amount_paid": 4300,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMz0200noOCGhEX?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMz0200noOCGhEX/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 6300,
-                "amount_excluding_tax": 6300,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice": "in_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 18,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 4300,
-          "subtotal_excluding_tax": 4300,
-          "tax": null,
-          "test_clock": null,
-          "total": 4300,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 4300,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OmTnVDEQaroqDjsplJmhFMQ",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "29906042-b934-42b5-9c9b-10ba955641d0"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.create.1.json
index 4f060c1df9..f2ec80f992 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.create.1.json
@@ -215,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.finalize_invoice.1.json
index 9513e04f02..667fb02281 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMw0200kRUVZYHN?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI0OQ0200awvFeJgq?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMw0200kRUVZYHN/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI0OQ0200awvFeJgq/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -215,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.pay.1.json
index ab0d215f27..81cbec897a 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMy0200cCzjjY4e?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QYmhCdjYxQ1RRQWk5NFBDQXlrbEF6akkwZmNNSHIwLDk5MTE2NTMy0200cCzjjY4e/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VNlNBaW5tVGo2RFVudzd0VTB0MHNEVlR5a2R2LDEwMDA2NjI1MQ0200SIvI0Yzu/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.create.1.json
index 355ce9f41b..7f364f3ee5 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OmTnMDEQaroqDjsp7p179yi_secret_PbhBGOjLkaTT0DQohUTp7yAd1MtTySE",
+  "client_secret": "seti_1OqSrPDEQaroqDjsy1FAYhvw_secret_PfoUASySNiJhQLwVD5uwtalSARvk209",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OmTnMDEQaroqDjsp7p179yi",
+  "id": "seti_1OqSrPDEQaroqDjsy1FAYhvw",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OmTnMDEQaroqDjsH6BnkKDO",
+  "latest_attempt": "setatt_1OqSrQDEQaroqDjstPhmXw7h",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+  "payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.list.1.json
index 571dbff45f..2deb36a5ed 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OmTnLDEQaroqDjsYfcrAlYn_secret_PbhB8yVO1cA4OvqXVcBnSL5TUAM6hqJ",
+      "client_secret": "seti_1OqSrPDEQaroqDjsuPxn10Wg_secret_PfoUXsES5JReK2lwGhdnjYKVc8logTd",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OmTnLDEQaroqDjsYfcrAlYn",
+      "id": "seti_1OqSrPDEQaroqDjsuPxn10Wg",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.retrieve.1.json
index 355ce9f41b..7f364f3ee5 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OmTnMDEQaroqDjsp7p179yi_secret_PbhBGOjLkaTT0DQohUTp7yAd1MtTySE",
+  "client_secret": "seti_1OqSrPDEQaroqDjsy1FAYhvw_secret_PfoUASySNiJhQLwVD5uwtalSARvk209",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OmTnMDEQaroqDjsp7p179yi",
+  "id": "seti_1OqSrPDEQaroqDjsy1FAYhvw",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OmTnMDEQaroqDjsH6BnkKDO",
+  "latest_attempt": "setatt_1OqSrQDEQaroqDjstPhmXw7h",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OmTnMDEQaroqDjsXJSvs7og",
+  "payment_method": "pm_1OqSrPDEQaroqDjsAwB6c7Pj",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.create.1.json
index 1a9440d877..42791b6e87 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02eR4SBMTHiYbN8Dzr91OpRWqldiSzH4RQaETbiRVzGUTQ5G",
+  "id": "cs_test_NORMALIZED02NSATWszzJuau6llgn7CNQeLi4sqVbbBe2iSoHdF7h41dv5",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "1",
+    "remote_server_user_id": "4",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OmTnLDEQaroqDjsYfcrAlYn",
+  "setup_intent": "seti_1OqSrPDEQaroqDjsuPxn10Wg",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02eR4SBMTHiYbN8Dzr91OpRWqldiSzH4RQaETbiRVzGUTQ5G#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02NSATWszzJuau6llgn7CNQeLi4sqVbbBe2iSoHdF7h41dv5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.list.1.json
index b96cac7256..7059063a14 100644
--- a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02eR4SBMTHiYbN8Dzr91OpRWqldiSzH4RQaETbiRVzGUTQ5G",
+      "id": "cs_test_NORMALIZED02NSATWszzJuau6llgn7CNQeLi4sqVbbBe2iSoHdF7h41dv5",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "1",
+        "remote_server_user_id": "4",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OmTnLDEQaroqDjsYfcrAlYn",
+      "setup_intent": "seti_1OqSrPDEQaroqDjsuPxn10Wg",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02eR4SBMTHiYbN8Dzr91OpRWqldiSzH4RQaETbiRVzGUTQ5G#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02NSATWszzJuau6llgn7CNQeLi4sqVbbBe2iSoHdF7h41dv5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.modify.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.modify.1.json
index 00fd7aa441..f72bbc4ca0 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+    "default_payment_method": "pm_1OqSkjDEQaroqDjslPZdz4HV",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.2.json
index 1068accce3..2d29098309 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+      "id": "pm_1OqSkjDEQaroqDjslPZdz4HV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.3.json
index 1068accce3..2d29098309 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+      "id": "pm_1OqSkjDEQaroqDjslPZdz4HV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.4.json
index 1068accce3..2d29098309 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+      "id": "pm_1OqSkjDEQaroqDjslPZdz4HV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.5.json
index 1068accce3..2d29098309 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+      "id": "pm_1OqSkjDEQaroqDjslPZdz4HV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.6.json
index 1068accce3..2d29098309 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+      "id": "pm_1OqSkjDEQaroqDjslPZdz4HV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.7.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.7.json
index cbfd2cf33b..058be2ca9f 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.7.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.7.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+      "id": "pm_1OqSkjDEQaroqDjslPZdz4HV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.1.json
index f901bd8492..f255b07e88 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.1.json
@@ -5,177 +5,83 @@
       "created": 1010000003,
       "data": {
         "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 10000,
-          "amount_paid": 0,
-          "amount_remaining": 10000,
-          "amount_shipping": 0,
+          "amount": 10000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
           "application": null,
           "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": true,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "send_invoice",
-          "created": 1010000004,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0002",
-          "customer_address": null,
-          "customer_email": "user-0-test-realm-8@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": 1000000000,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loVGtybVZmVDJDNjV5OUNPOHBkaW1zdWpNazdPLDk4MDI4NDcy0200niMBECU0?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loVGtybVZmVDJDNjV5OUNPOHBkaW1zdWpNazdPLDk4MDI4NDcy0200niMBECU0/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 10000,
-                "amount_excluding_tax": 10000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1010000005,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 10000,
-                  "unit_amount_decimal": "10000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "10000"
-              }
-            ],
+          "automatic_payment_methods": null,
+          "canceled_at": 1000000000,
+          "cancellation_reason": "void_invoice",
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
             "has_more": false,
             "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
+          "client_secret": "pi_NORMALIZED00000000000001_secret_3SIIe9ijLO3GAmASp3dqDPFvx",
+          "confirmation_method": "automatic",
+          "created": 1010000004,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0002",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "last_payment_error": null,
+          "latest_charge": null,
           "livemode": false,
           "metadata": {},
-          "next_payment_attempt": null,
-          "number": "NORMALI-0001",
-          "object": "invoice",
+          "next_action": null,
+          "object": "payment_intent",
           "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
             }
           },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "user-0-test-realm-6@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
           "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 10000,
-          "subtotal_excluding_tax": 10000,
-          "tax": null,
-          "test_clock": null,
-          "total": 10000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 10000,
-          "total_tax_amounts": [],
+          "statement_descriptor_suffix": null,
+          "status": "canceled",
           "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
+          "transfer_group": null
         }
       },
-      "id": "evt_1Ohuk8DEQaroqDjscKor7WF5",
+      "id": "evt_3OqSkODEQaroqDjs1kW8H6EA",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": null,
-        "idempotency_key": null
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "1322dedf-e83e-494a-b964-c252ba4ee4fb"
       },
-      "type": "invoice.sent"
+      "type": "payment_intent.canceled"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.2.json
index 0d2c263302..e08ed27f9b 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.2.json
@@ -2,7 +2,7 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1010000006,
+      "created": 1010000005,
       "data": {
         "object": {
           "address": null,
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+            "default_payment_method": "pm_1OqSkjDEQaroqDjslPZdz4HV",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhukDDEQaroqDjseCn0pSI9",
+      "id": "evt_1OqSklDEQaroqDjsA5wC7FQl",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0001",
-        "idempotency_key": "c6659b30-1035-4f78-8b2e-0af5cf2ee620"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "95d0fc0b-2dde-4840-8c53-bd9ab6f13250"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.1.json
index 235772c51f..7555cdc456 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000007,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000008,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.2.json
index 4b6ebf1d83..0e56caf145 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.2.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000009,
+  "created": 1010000008,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000003",
-        "invoice_item": "ii_NORMALIZED00000000000003",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000003",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000010,
+          "created": 1010000009,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000003",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0003",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 5172,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.3.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.3.json
index e37ad8e4fe..39672a9210 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.3.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000011,
+  "created": 1010000010,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000004",
-        "invoice_item": "ii_NORMALIZED00000000000004",
+        "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000004",
+        "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000008,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 152000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.1.json
index fa708acd12..f705ee1dcb 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000007,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDgy0200r7zsUPh1?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzNQ0200kvhI2u2B?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDgy0200r7zsUPh1/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzNQ0200kvhI2u2B/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000008,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,7 +111,7 @@
   "livemode": false,
   "metadata": {},
   "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0001",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.2.json
index 7b9e6aca6f..e604775926 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.2.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000009,
+  "created": 1010000008,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loRUF4YXBod0c5VUkwd3RHcVBiMnY5cVlmb3k3LDk4MDI4NDg002006c7Grtcc?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZzFjZm52QUdNSzlFRUJVcE9uQ3BnVFhoQXRsLDEwMDA2NTgzOA02002ms2FNrj?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loRUF4YXBod0c5VUkwd3RHcVBiMnY5cVlmb3k3LDk4MDI4NDg002006c7Grtcc/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZzFjZm52QUdNSzlFRUJVcE9uQ3BnVFhoQXRsLDEwMDA2NTgzOA02002ms2FNrj/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000003",
-        "invoice_item": "ii_NORMALIZED00000000000003",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000003",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000010,
+          "created": 1010000009,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000003",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0003",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,7 +111,7 @@
   "livemode": false,
   "metadata": {},
   "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0003",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 5172,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.3.json
index 51cb2b274b..3449553787 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.3.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000011,
+  "created": 1010000010,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loNzd6cGZyZXF3OGp1TlQ1ZTVrUjJST2plWFNYLDk4MDI4NDg30200z9cen6lj?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OelZqQ2lSYlhrMDI4cjVmS3VKTjRjU21xTk1oLDEwMDA2NTg0MA0200VEagJ2dX?s=ap",
   "id": "in_NORMALIZED00000000000004",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loNzd6cGZyZXF3OGp1TlQ1ZTVrUjJST2plWFNYLDk4MDI4NDg30200z9cen6lj/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OelZqQ2lSYlhrMDI4cjVmS3VKTjRjU21xTk1oLDEwMDA2NTg0MA0200VEagJ2dX/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000004",
-        "invoice_item": "ii_NORMALIZED00000000000004",
+        "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000004",
+        "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000008,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -110,7 +111,7 @@
   "livemode": false,
   "metadata": {},
   "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0004",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 152000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.4.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.4.json
index ad24964ed0..7f481b4595 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.4.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.4.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000007,
+      "created": 1010000006,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDgy0200r7zsUPh1?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzNg02009EmQbaxS?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDgy0200r7zsUPh1/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzNg02009EmQbaxS/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -61,8 +61,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
+            "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000002",
+            "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -74,16 +75,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000008,
+              "created": 1010000007,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000001",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0001",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -112,7 +113,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0001",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -160,7 +161,7 @@
       "total_excluding_tax": 120000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.5.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.5.json
index 10a772ca42..7f481b4595 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.5.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.5.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000007,
+      "created": 1010000006,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDgz020019uYVDxm?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzNg02009EmQbaxS?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDgz020019uYVDxm/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzNg02009EmQbaxS/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -61,8 +61,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
+            "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000002",
+            "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -74,16 +75,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000008,
+              "created": 1010000007,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000001",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0001",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -112,7 +113,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0001",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -160,7 +161,7 @@
       "total_excluding_tax": 120000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.6.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.6.json
index 390643e552..9fe4241f90 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.6.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.6.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000009,
+      "created": 1010000008,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loRUF4YXBod0c5VUkwd3RHcVBiMnY5cVlmb3k3LDk4MDI4NDg10200kHX9vG2O?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZzFjZm52QUdNSzlFRUJVcE9uQ3BnVFhoQXRsLDEwMDA2NTgzOA02002ms2FNrj?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loRUF4YXBod0c5VUkwd3RHcVBiMnY5cVlmb3k3LDk4MDI4NDg10200kHX9vG2O/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZzFjZm52QUdNSzlFRUJVcE9uQ3BnVFhoQXRsLDEwMDA2NTgzOA02002ms2FNrj/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -61,8 +61,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000003",
-            "invoice_item": "ii_NORMALIZED00000000000003",
+            "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000003",
+            "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -74,16 +75,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000010,
+              "created": 1010000009,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000003",
+              "id": "price_NORMALIZED00000000000002",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0003",
+              "product": "prod_NORMALIZED0002",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -112,7 +113,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0003",
+      "number": "NORMALI-0002",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -183,7 +184,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000007,
+      "created": 1010000006,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDg10200t2UAPpYu?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzOA0200Y39K06vq?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDg10200t2UAPpYu/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTgzOA0200Y39K06vq/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -223,8 +224,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
+            "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000002",
+            "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -236,16 +238,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000008,
+              "created": 1010000007,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000001",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0001",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -274,7 +276,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0001",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.7.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.7.json
index 9156def73f..8000b65d7f 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.7.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.7.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000011,
+      "created": 1010000010,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loNzd6cGZyZXF3OGp1TlQ1ZTVrUjJST2plWFNYLDk4MDI4NDg30200z9cen6lj?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OelZqQ2lSYlhrMDI4cjVmS3VKTjRjU21xTk1oLDEwMDA2NTg0MA0200VEagJ2dX?s=ap",
       "id": "in_NORMALIZED00000000000004",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loNzd6cGZyZXF3OGp1TlQ1ZTVrUjJST2plWFNYLDk4MDI4NDg30200z9cen6lj/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OelZqQ2lSYlhrMDI4cjVmS3VKTjRjU21xTk1oLDEwMDA2NTg0MA0200VEagJ2dX/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -61,8 +61,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000004",
-            "invoice_item": "ii_NORMALIZED00000000000004",
+            "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000004",
+            "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -74,16 +75,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000008,
+              "created": 1010000007,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000001",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0001",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -112,7 +113,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0004",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -160,7 +161,7 @@
       "total_excluding_tax": 152000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -183,7 +184,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000009,
+      "created": 1010000008,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loRUF4YXBod0c5VUkwd3RHcVBiMnY5cVlmb3k3LDk4MDI4NDg30200Z25thjKj?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZzFjZm52QUdNSzlFRUJVcE9uQ3BnVFhoQXRsLDEwMDA2NTg0MA0200QXD5cMAf?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loRUF4YXBod0c5VUkwd3RHcVBiMnY5cVlmb3k3LDk4MDI4NDg30200Z25thjKj/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZzFjZm52QUdNSzlFRUJVcE9uQ3BnVFhoQXRsLDEwMDA2NTg0MA0200QXD5cMAf/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -223,8 +224,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000003",
-            "invoice_item": "ii_NORMALIZED00000000000003",
+            "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000003",
+            "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -236,16 +238,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000010,
+              "created": 1010000009,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000003",
+              "id": "price_NORMALIZED00000000000002",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0003",
+              "product": "prod_NORMALIZED0002",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -274,7 +276,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0003",
+      "number": "NORMALI-0002",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -345,7 +347,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000007,
+      "created": 1010000006,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -367,9 +369,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDg30200hzGCtsh2?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTg0MA0200wn4bIqpC?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loTWNtcTFwSzM2Mkkyd3RmZnEzTjd0OEdaOWZ6LDk4MDI4NDg30200hzGCtsh2/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OZU9MUE45eHp4aFFTaUt5UGVLN0k2OXFUazc2LDEwMDA2NTg0MA0200wn4bIqpC/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -385,8 +387,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
+            "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000002",
+            "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -398,16 +401,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000008,
+              "created": 1010000007,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000001",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0001",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -436,7 +439,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0001",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.1.json
index 697361235d..3e1ad97f06 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.1.json
@@ -6,7 +6,7 @@
   "description": "Zulip Cloud Standard - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000002",
+  "id": "ii_NORMALIZED00000000000001",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000008,
+    "created": 1010000007,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000002",
+    "id": "price_NORMALIZED00000000000001",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0002",
+    "product": "prod_NORMALIZED0001",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.2.json
index d28b83c876..e31609ac96 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.2.json
@@ -6,7 +6,7 @@
   "description": "Additional license (Jan 2, 2013 - Mar 2, 2013)",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000003",
+  "id": "ii_NORMALIZED00000000000002",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000010,
+    "created": 1010000009,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000003",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0003",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.3.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.3.json
index 2a108e06a4..af94cd0fc3 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.3.json
@@ -6,7 +6,7 @@
   "description": "Zulip Cloud Standard - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000004",
+  "id": "ii_NORMALIZED00000000000003",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000008,
+    "created": 1010000007,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000002",
+    "id": "price_NORMALIZED00000000000001",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0002",
+    "product": "prod_NORMALIZED0001",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.create.1.json
index cc6555390b..4ca5a1dc0e 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhukBDEQaroqDjsJ0uk2Osm_secret_PWyhgwHjNNPup4GUhAwJXH9bP9HIiEZ",
+  "client_secret": "seti_1OqSkjDEQaroqDjs9i00Ogdy_secret_PfoNg1nVctEahydTPWgvccIuALjl4Mx",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhukBDEQaroqDjsJ0uk2Osm",
+  "id": "seti_1OqSkjDEQaroqDjs9i00Ogdy",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhukBDEQaroqDjsheW422vS",
+  "latest_attempt": "setatt_1OqSkjDEQaroqDjs2THvyfpf",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+  "payment_method": "pm_1OqSkjDEQaroqDjslPZdz4HV",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.list.1.json
index 3b48f77c51..fe566b133e 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhukADEQaroqDjsxvaLmMIA_secret_PWyhL6yFTUksbf7XAnSqt2bAMjr85XW",
-      "created": 1010000012,
+      "client_secret": "seti_1OqSkiDEQaroqDjsYcu9uNt3_secret_PfoNlryVCaDhS3xVzqoqwAUwLFO0iUM",
+      "created": 1010000011,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhukADEQaroqDjsxvaLmMIA",
+      "id": "seti_1OqSkiDEQaroqDjsYcu9uNt3",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.retrieve.1.json
index cc6555390b..4ca5a1dc0e 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhukBDEQaroqDjsJ0uk2Osm_secret_PWyhgwHjNNPup4GUhAwJXH9bP9HIiEZ",
+  "client_secret": "seti_1OqSkjDEQaroqDjs9i00Ogdy_secret_PfoNg1nVctEahydTPWgvccIuALjl4Mx",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhukBDEQaroqDjsJ0uk2Osm",
+  "id": "seti_1OqSkjDEQaroqDjs9i00Ogdy",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhukBDEQaroqDjsheW422vS",
+  "latest_attempt": "setatt_1OqSkjDEQaroqDjs2THvyfpf",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhukBDEQaroqDjsu72tJ4pe",
+  "payment_method": "pm_1OqSkjDEQaroqDjslPZdz4HV",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.create.1.json
index a22563c6c6..b80ee2cb58 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000012,
+  "created": 1010000011,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02bLnu7yiBu3jw2N8Lc4q5NmmyoOwZuWMburH0EF1EyGUHv5",
+  "id": "cs_test_NORMALIZED028pGbqAkdRWtoAmUXD6rJ8xb8skNohyPXJ3BcCiKr0bDwIV",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhukADEQaroqDjsxvaLmMIA",
+  "setup_intent": "seti_1OqSkiDEQaroqDjsYcu9uNt3",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02bLnu7yiBu3jw2N8Lc4q5NmmyoOwZuWMburH0EF1EyGUHv5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028pGbqAkdRWtoAmUXD6rJ8xb8skNohyPXJ3BcCiKr0bDwIV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.list.1.json
index 38f7c6e9a6..9473eeeaf0 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000012,
+      "created": 1010000011,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02bLnu7yiBu3jw2N8Lc4q5NmmyoOwZuWMburH0EF1EyGUHv5",
+      "id": "cs_test_NORMALIZED028pGbqAkdRWtoAmUXD6rJ8xb8skNohyPXJ3BcCiKr0bDwIV",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhukADEQaroqDjsxvaLmMIA",
+      "setup_intent": "seti_1OqSkiDEQaroqDjsYcu9uNt3",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02bLnu7yiBu3jw2N8Lc4q5NmmyoOwZuWMburH0EF1EyGUHv5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028pGbqAkdRWtoAmUXD6rJ8xb8skNohyPXJ3BcCiKr0bDwIV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Event.list.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Event.list.1.json
index f0284e1b7d..bb3be2ddcb 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Event.list.1.json
@@ -25,7 +25,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000002,
+          "created": 1010000003,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0002",
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loNzd6cGZyZXF3OGp1TlQ1ZTVrUjJST2plWFNYLDk4MDI4NDg30200z9cen6lj?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OelZqQ2lSYlhrMDI4cjVmS3VKTjRjU21xTk1oLDEwMDA2NTg0MA0200VEagJ2dX?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loNzd6cGZyZXF3OGp1TlQ1ZTVrUjJST2plWFNYLDk4MDI4NDg30200z9cen6lj/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OelZqQ2lSYlhrMDI4cjVmS3VKTjRjU21xTk1oLDEwMDA2NTg0MA0200VEagJ2dX/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -78,7 +79,7 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000003,
+                  "created": 1010000004,
                   "currency": "usd",
                   "custom_unit_amount": null,
                   "id": "price_NORMALIZED00000000000001",
@@ -164,16 +165,16 @@
           "total_excluding_tax": 152000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhukNDEQaroqDjs40VUHRUw",
+      "id": "evt_1OqSkuDEQaroqDjsY9KS2nLh",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "d2ecbced-d6ac-49f4-a24c-d18cacb52e73"
+        "idempotency_key": "b882a977-ceed-49dd-82a7-326dac8a822b"
       },
       "type": "invoice.finalized"
     }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.1.json
index b3519ad648..fdea49c9f0 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "send_invoice",
-  "created": 1010000004,
+  "created": 1010000005,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000003,
+          "created": 1010000004,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000001",
@@ -158,5 +159,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.2.json
index 9ba2473169..213847562a 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.2.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "send_invoice",
-  "created": 1010000005,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000003,
+          "created": 1010000004,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000001",
@@ -158,5 +159,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.1.json
index e90415b7bc..def219ba78 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "send_invoice",
-  "created": 1010000004,
+  "created": 1010000005,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDkx0200EstTWCwg?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NA020059hrx6OW?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDkx0200EstTWCwg/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NA020059hrx6OW/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000003,
+          "created": 1010000004,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000001",
@@ -158,5 +159,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.2.json
index a05e5fc788..34b5a7bbab 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.2.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "send_invoice",
-  "created": 1010000005,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loU1VvZ29BYlBtTFdoQXlDZDF3MVQxWldnVjdxLDk4MDI4NDk002000Zt9J8dF?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OS2E4cWJ4YnRVREl2RUZEYXBSSmF0c3R6MjFiLDEwMDA2NTg0Nw0200WFtsvfPz?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loU1VvZ29BYlBtTFdoQXlDZDF3MVQxWldnVjdxLDk4MDI4NDk002000Zt9J8dF/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OS2E4cWJ4YnRVREl2RUZEYXBSSmF0c3R6MjFiLDEwMDA2NTg0Nw0200WFtsvfPz/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000003,
+          "created": 1010000004,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000001",
@@ -158,5 +159,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.2.json
index 32a904aba8..ba11fff01c 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.2.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "send_invoice",
-      "created": 1010000004,
+      "created": 1010000005,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDky0200uVgNWhkX?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NQ0200ntMhIeqZ?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDky0200uVgNWhkX/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NQ0200ntMhIeqZ/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -74,7 +75,7 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000003,
+              "created": 1010000004,
               "currency": "usd",
               "custom_unit_amount": null,
               "id": "price_NORMALIZED00000000000001",
@@ -160,7 +161,7 @@
       "total_excluding_tax": 984000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.3.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.3.json
index 32a904aba8..ba11fff01c 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.3.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.3.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "send_invoice",
-      "created": 1010000004,
+      "created": 1010000005,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDky0200uVgNWhkX?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NQ0200ntMhIeqZ?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDky0200uVgNWhkX/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NQ0200ntMhIeqZ/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -74,7 +75,7 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000003,
+              "created": 1010000004,
               "currency": "usd",
               "custom_unit_amount": null,
               "id": "price_NORMALIZED00000000000001",
@@ -160,7 +161,7 @@
       "total_excluding_tax": 984000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.4.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.4.json
index 32a904aba8..ba11fff01c 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.4.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.4.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "send_invoice",
-      "created": 1010000004,
+      "created": 1010000005,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDky0200uVgNWhkX?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NQ0200ntMhIeqZ?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDky0200uVgNWhkX/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0NQ0200ntMhIeqZ/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -74,7 +75,7 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000003,
+              "created": 1010000004,
               "currency": "usd",
               "custom_unit_amount": null,
               "id": "price_NORMALIZED00000000000001",
@@ -160,7 +161,7 @@
       "total_excluding_tax": 984000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.5.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.5.json
index 828812013e..590fa7cbf9 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.5.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.5.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "send_invoice",
-      "created": 1010000005,
+      "created": 1010000006,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loU1VvZ29BYlBtTFdoQXlDZDF3MVQxWldnVjdxLDk4MDI4NDk002000Zt9J8dF?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OS2E4cWJ4YnRVREl2RUZEYXBSSmF0c3R6MjFiLDEwMDA2NTg0Nw0200WFtsvfPz?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loU1VvZ29BYlBtTFdoQXlDZDF3MVQxWldnVjdxLDk4MDI4NDk002000Zt9J8dF/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OS2E4cWJ4YnRVREl2RUZEYXBSSmF0c3R6MjFiLDEwMDA2NTg0Nw0200WFtsvfPz/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -74,7 +75,7 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000003,
+              "created": 1010000004,
               "currency": "usd",
               "custom_unit_amount": null,
               "id": "price_NORMALIZED00000000000001",
@@ -160,7 +161,7 @@
       "total_excluding_tax": 984000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -183,7 +184,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "send_invoice",
-      "created": 1010000004,
+      "created": 1010000005,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDk00200IMQ5dsOC?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0Nw0200bdzFbcTt?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3loc3Q0S2RZWHVSMzhpQjhWeVNBaWh6d1JQQ0xJLDk4MDI4NDk00200IMQ5dsOC/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg0Nw0200bdzFbcTt/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -236,7 +238,7 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000003,
+              "created": 1010000004,
               "currency": "usd",
               "custom_unit_amount": null,
               "id": "price_NORMALIZED00000000000001",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.1.json
index f5dc26cb19..c39e2caf13 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.1.json
@@ -19,7 +19,7 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000003,
+    "created": 1010000004,
     "currency": "usd",
     "custom_unit_amount": null,
     "id": "price_NORMALIZED00000000000001",
diff --git a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.2.json
index 28b1958667..bdc219dca6 100644
--- a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.2.json
@@ -19,7 +19,7 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000003,
+    "created": 1010000004,
     "currency": "usd",
     "custom_unit_amount": null,
     "id": "price_NORMALIZED00000000000001",
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.modify.1.json
index cf5264860d..28b2dad918 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+    "default_payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.1.json
index 36cc773544..db8e196ef0 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+      "id": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.2.json
index 36cc773544..db8e196ef0 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+      "id": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.3.json
index 36cc773544..db8e196ef0 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+      "id": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.4.json
index 36cc773544..db8e196ef0 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+      "id": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.1.json
index 3867818e5c..9dbb030799 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+            "default_payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuoEDEQaroqDjs8HZO5Rzs",
+      "id": "evt_1OqSoXDEQaroqDjsmnymxTD0",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "4dda974f-f6bc-4931-922c-02d858277299"
+        "idempotency_key": "e9052f0d-cf75-4df5-b0a5-f7dc447aa682"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.2.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.2.json
index 2b3b12cc74..256996d64b 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+                "payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 1850,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLzlmK4GMgakdasQ5PY6LBZbbqVr_lJnVvmWYrCBkAunlpsMQhCb3KFGR5g1n0VyfL-c6NTLeYjWzzMc?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJaSla8GMgbXgcwjw5g6LBbREE3XRXBpDkUgsGCkRAId6qCviB3XNh3E7wPAOQ9Q7yfHc7k5AwQ-Hgsu?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_Vp1k2h6MP5DwYTpsXtRQdHHY4",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_4vVUU0JxFymFKfuhStdPHpnu5",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+          "payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuoHDEQaroqDjs1LYLNYm4",
+      "id": "evt_3OqSoaDEQaroqDjs0VA2inVS",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "08324bae-4472-4b44-aaef-053411cd5243"
+        "idempotency_key": "d17a4cbf-0a8d-4822-9e91-f4eedcafe56a"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+          "payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
           "payment_method_details": {
             "card": {
               "amount_authorized": 1850,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLzlmK4GMgYoSY1Z2Pk6LBZ1HYQGkpa0zhKYczXfOhRYOsEim42HpvddyurY9C_V1nK2fNe5aF2tC2sa?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJaSla8GMgar8YD7rFw6LBbatXWQjuGRgsuvN5ADKDWaVRV1i5c1QWPeWY09H-FFQPN5s2TatiLgrVzS?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,16 +309,200 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuoHDEQaroqDjs1fhr24YB",
+      "id": "evt_3OqSoaDEQaroqDjs0ZuIFBC2",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "08324bae-4472-4b44-aaef-053411cd5243"
+        "idempotency_key": "d17a4cbf-0a8d-4822-9e91-f4eedcafe56a"
       },
       "type": "charge.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 320000,
+          "amount_paid": 0,
+          "amount_remaining": 320000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0002",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjA2OQ02002L4OK74l?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjA2OQ02002L4OK74l/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 320000,
+                "amount_excluding_tax": 320000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 40,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "40",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 320000,
+          "subtotal_excluding_tax": 320000,
+          "tax": null,
+          "test_clock": null,
+          "total": 320000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 320000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSobDEQaroqDjsgOdXAkYX",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": null
+      },
+      "type": "invoice.sent"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -366,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMw02003vwvtNJ0?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA2OQ0200jZABuK8m?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMw02003vwvtNJ0/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA2OQ0200jZABuK8m/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -384,8 +568,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -400,13 +585,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -434,8 +619,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000003",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000003",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -450,13 +636,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000003",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0003",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -490,7 +676,7 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
@@ -538,16 +724,16 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuoIDEQaroqDjsHfHdD0XN",
+      "id": "evt_1OqSobDEQaroqDjsgEszx347",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "84f03108-a727-4ed3-ab1c-2c8d90df0109"
+        "idempotency_key": "9b1bf80e-2a72-419a-a3b5-639602a8b629"
       },
       "type": "invoice.finalized"
     },
@@ -598,9 +784,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMw02003vwvtNJ0?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA2OQ0200jZABuK8m?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMw02003vwvtNJ0/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA2OQ0200jZABuK8m/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -616,8 +802,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -632,13 +819,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -666,8 +853,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000003",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000003",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -682,13 +870,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000003",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0003",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -722,7 +910,7 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
@@ -770,7 +958,7 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -790,13 +978,13 @@
           }
         }
       },
-      "id": "evt_1OhuoIDEQaroqDjsXmgQD3nv",
+      "id": "evt_1OqSobDEQaroqDjsFHsSJcUB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "84f03108-a727-4ed3-ab1c-2c8d90df0109"
+        "idempotency_key": "9b1bf80e-2a72-419a-a3b5-639602a8b629"
       },
       "type": "invoice.updated"
     },
@@ -824,7 +1012,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_Vp1k2h6MP5DwYTpsXtRQdHHY4",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_4vVUU0JxFymFKfuhStdPHpnu5",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -867,13 +1055,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuoHDEQaroqDjs1wdK8LLx",
+      "id": "evt_3OqSoaDEQaroqDjs0VUsu0yI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "84f03108-a727-4ed3-ab1c-2c8d90df0109"
+        "idempotency_key": "9b1bf80e-2a72-419a-a3b5-639602a8b629"
       },
       "type": "payment_intent.created"
     },
@@ -942,8 +1130,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -958,13 +1147,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -992,8 +1181,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000003",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000003",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -1008,13 +1198,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000003",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0003",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -1096,16 +1286,16 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuoHDEQaroqDjs2tFyfTzU",
+      "id": "evt_1OqSoaDEQaroqDjsMguNpgeb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "4febc535-aa6a-462e-89d0-f3cfdcc1de32"
+        "idempotency_key": "8ae6b941-cc9c-4217-897b-e492235ddc50"
       },
       "type": "invoice.created"
     },
@@ -1121,68 +1311,6 @@
           "description": "$20.00/month new customer discount",
           "discountable": false,
           "discounts": [],
-          "id": "ii_NORMALIZED00000000000001",
-          "invoice": null,
-          "livemode": false,
-          "metadata": {},
-          "object": "invoiceitem",
-          "period": {
-            "end": 1000000000,
-            "start": 1000000000
-          },
-          "plan": null,
-          "price": {
-            "active": false,
-            "billing_scheme": "per_unit",
-            "created": 1000000000,
-            "currency": "usd",
-            "custom_unit_amount": null,
-            "id": "price_NORMALIZED00000000000001",
-            "livemode": false,
-            "lookup_key": null,
-            "metadata": {},
-            "nickname": null,
-            "object": "price",
-            "product": "prod_NORMALIZED0001",
-            "recurring": null,
-            "tax_behavior": "unspecified",
-            "tiers_mode": null,
-            "transform_quantity": null,
-            "type": "one_time",
-            "unit_amount": -2000,
-            "unit_amount_decimal": "-2000"
-          },
-          "proration": false,
-          "quantity": 1,
-          "subscription": null,
-          "tax_rates": [],
-          "test_clock": null,
-          "unit_amount": -2000,
-          "unit_amount_decimal": "-2000"
-        }
-      },
-      "id": "evt_1OhuoGDEQaroqDjsqCVRo4DZ",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0005",
-        "idempotency_key": "ea7ff6ca-0f0b-4ba9-ba14-21a5d3beb67c"
-      },
-      "type": "invoiceitem.created"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 3850,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "date": 1000000000,
-          "description": "Zulip Basic",
-          "discountable": false,
-          "discounts": [],
           "id": "ii_NORMALIZED00000000000002",
           "invoice": null,
           "livemode": false,
@@ -1211,6 +1339,68 @@
             "tiers_mode": null,
             "transform_quantity": null,
             "type": "one_time",
+            "unit_amount": -2000,
+            "unit_amount_decimal": "-2000"
+          },
+          "proration": false,
+          "quantity": 1,
+          "subscription": null,
+          "tax_rates": [],
+          "test_clock": null,
+          "unit_amount": -2000,
+          "unit_amount_decimal": "-2000"
+        }
+      },
+      "id": "evt_1OqSoZDEQaroqDjsgEMaG82z",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "1b7a9519-8763-468a-bd42-9a38089ca0d4"
+      },
+      "type": "invoiceitem.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 3850,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "date": 1000000000,
+          "description": "Zulip Basic",
+          "discountable": false,
+          "discounts": [],
+          "id": "ii_NORMALIZED00000000000003",
+          "invoice": null,
+          "livemode": false,
+          "metadata": {},
+          "object": "invoiceitem",
+          "period": {
+            "end": 1000000000,
+            "start": 1000000000
+          },
+          "plan": null,
+          "price": {
+            "active": false,
+            "billing_scheme": "per_unit",
+            "created": 1000000000,
+            "currency": "usd",
+            "custom_unit_amount": null,
+            "id": "price_NORMALIZED00000000000003",
+            "livemode": false,
+            "lookup_key": null,
+            "metadata": {},
+            "nickname": null,
+            "object": "price",
+            "product": "prod_NORMALIZED0003",
+            "recurring": null,
+            "tax_behavior": "unspecified",
+            "tiers_mode": null,
+            "transform_quantity": null,
+            "type": "one_time",
             "unit_amount": 350,
             "unit_amount_decimal": "350"
           },
@@ -1223,13 +1413,13 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1OhuoGDEQaroqDjsfiyCQ4so",
+      "id": "evt_1OqSoZDEQaroqDjsWb5CFnI1",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "b892961a-b0eb-4c57-8859-a84bdf43dfa0"
+        "idempotency_key": "81c05b5a-fc2b-4df0-bbae-469b266037ba"
       },
       "type": "invoiceitem.created"
     },
@@ -1245,21 +1435,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+            "default_payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1275,13 +1465,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhuoGDEQaroqDjs7x2gHBEm",
+      "id": "evt_1OqSoZDEQaroqDjsk94Uxp86",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "b892961a-b0eb-4c57-8859-a84bdf43dfa0"
+        "idempotency_key": "81c05b5a-fc2b-4df0-bbae-469b266037ba"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.3.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.3.json
index c0611cc2c4..febd3471fa 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMz0200OKYDUhAc?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MQ0200I8D3wIl3?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMz0200OKYDUhAc/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MQ0200I8D3wIl3/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -65,8 +65,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -81,13 +82,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -115,8 +116,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000003",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000003",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -131,13 +133,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000003",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0003",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -171,7 +173,7 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0002",
+          "number": "NORMALI-0003",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
@@ -222,13 +224,247 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuoLDEQaroqDjsanHvrF9Z",
+      "id": "evt_1OqSodDEQaroqDjsel23kCUQ",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "08324bae-4472-4b44-aaef-053411cd5243"
+        "idempotency_key": "d17a4cbf-0a8d-4822-9e91-f4eedcafe56a"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 1850,
+          "amount_paid": 1850,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MQ0200I8D3wIl3?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MQ0200I8D3wIl3/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 3850,
+                "amount_excluding_tax": 3850,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000003",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000003",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000003",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0003",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 11,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "11",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0003",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 1850,
+          "subtotal_excluding_tax": 1850,
+          "tax": null,
+          "test_clock": null,
+          "total": 1850,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 1850,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSodDEQaroqDjs22vRLBnw",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "d17a4cbf-0a8d-4822-9e91-f4eedcafe56a"
       },
       "type": "invoice.paid"
     },
@@ -279,9 +515,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMy0200lqBEk13m?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MQ0200I8D3wIl3?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMy0200lqBEk13m/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MQ0200I8D3wIl3/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -297,8 +533,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -313,13 +550,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -347,8 +584,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000003",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000003",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -363,13 +601,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000003",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0003",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -403,7 +641,7 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0002",
+          "number": "NORMALI-0003",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhuoLDEQaroqDjsY7mendcP",
+      "id": "evt_1OqSodDEQaroqDjstNC4xmEv",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "08324bae-4472-4b44-aaef-053411cd5243"
+        "idempotency_key": "d17a4cbf-0a8d-4822-9e91-f4eedcafe56a"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.4.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.4.json
index 114fe9cd00..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 1850,
-          "amount_paid": 1850,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMz0200OKYDUhAc?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMz0200OKYDUhAc/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 3850,
-                "amount_excluding_tax": 3850,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 11,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "11",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 1850,
-          "subtotal_excluding_tax": 1850,
-          "tax": null,
-          "test_clock": null,
-          "total": 1850,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 1850,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhuoLDEQaroqDjsN3gON0PE",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "08324bae-4472-4b44-aaef-053411cd5243"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.create.1.json
index ce7570d59a..7bf7bc05ad 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.create.1.json
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -109,8 +110,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -125,13 +127,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000003",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0003",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.finalize_invoice.1.json
index e5f7f2fa7f..8c109995ea 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMw02003vwvtNJ0?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA2OQ0200jZABuK8m?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMw02003vwvtNJ0/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA2OQ0200jZABuK8m/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -109,8 +110,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -125,13 +127,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000003",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0003",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -165,7 +167,7 @@
     "plan_tier": "103"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.list.2.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.list.2.json
index 8d4103749b..45afb83f91 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzM00200yhkpIEw9?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3Mg02001LOXz5ks?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzM00200yhkpIEw9/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3Mg02001LOXz5ks/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -61,8 +61,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000001",
-            "invoice_item": "ii_NORMALIZED00000000000001",
+            "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000001",
+            "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -77,13 +78,13 @@
               "created": 1000000000,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000001",
+              "id": "price_NORMALIZED00000000000002",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0001",
+              "product": "prod_NORMALIZED0002",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -111,8 +112,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
+            "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000001",
+            "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -127,13 +129,13 @@
               "created": 1000000000,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000003",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0003",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -167,7 +169,7 @@
         "plan_tier": "103"
       },
       "next_payment_attempt": null,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.pay.1.json
index 1fce5271a0..2fa426408f 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMy0200lqBEk13m?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MA0200emkNIucw?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsM1BsdTA2NXhBclBjN21FVnVTRHQwaGFjd2o1LDk4MDI4NzMy0200lqBEk13m/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SN0laRXFtdUZPRHhqdUFNWWcwODVDcXJXTGNILDEwMDA2NjA3MA0200emkNIucw/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -109,8 +110,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -125,13 +127,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000003",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0003",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -165,7 +167,7 @@
     "plan_tier": "103"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.1.json
index c51e6b7239..8a77b28b28 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.1.json
@@ -6,7 +6,7 @@
   "description": "Zulip Basic",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000002",
+  "id": "ii_NORMALIZED00000000000003",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -22,13 +22,13 @@
     "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000002",
+    "id": "price_NORMALIZED00000000000003",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0002",
+    "product": "prod_NORMALIZED0003",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.2.json
index 242630a631..fa2a975195 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.2.json
@@ -6,7 +6,7 @@
   "description": "$20.00/month new customer discount",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000001",
+  "id": "ii_NORMALIZED00000000000002",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -22,13 +22,13 @@
     "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000001",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0001",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.create.1.json
index 7fd8c89408..38a1cf243e 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuoCDEQaroqDjsJXCNIS74_secret_PWylsdNYRCuRI0He3iR9Trcc3hCFDuP",
+  "client_secret": "seti_1OqSoVDEQaroqDjs8GXFhNj7_secret_PfoRew6KjGLU2x1yAqk4ZsEmTFxtYRG",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuoCDEQaroqDjsJXCNIS74",
+  "id": "seti_1OqSoVDEQaroqDjs8GXFhNj7",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuoCDEQaroqDjs0NgOC0TD",
+  "latest_attempt": "setatt_1OqSoVDEQaroqDjsLVR0DMiL",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+  "payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.list.1.json
index 2dc0ee9d43..3dc00eaac3 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuoBDEQaroqDjsjFJHRJXl_secret_PWylsBcgBIxA7pz3MvmxHhsaUbM2Gfx",
+      "client_secret": "seti_1OqSoUDEQaroqDjsLMp05KBc_secret_PfoRnHewuP4ZdbsiJBjY8nYYtafGZbz",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuoBDEQaroqDjsjFJHRJXl",
+      "id": "seti_1OqSoUDEQaroqDjsLMp05KBc",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.retrieve.1.json
index 7fd8c89408..38a1cf243e 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuoCDEQaroqDjsJXCNIS74_secret_PWylsdNYRCuRI0He3iR9Trcc3hCFDuP",
+  "client_secret": "seti_1OqSoVDEQaroqDjs8GXFhNj7_secret_PfoRew6KjGLU2x1yAqk4ZsEmTFxtYRG",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuoCDEQaroqDjsJXCNIS74",
+  "id": "seti_1OqSoVDEQaroqDjs8GXFhNj7",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuoCDEQaroqDjs0NgOC0TD",
+  "latest_attempt": "setatt_1OqSoVDEQaroqDjsLVR0DMiL",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuoCDEQaroqDjsKJZfmg59",
+  "payment_method": "pm_1OqSoVDEQaroqDjsEAaBy6ap",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.create.1.json
index ec72017a3a..75ba785248 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02IpPaBk0N2zya6kkxLd3rqZCxVa7A3wGYfav1QMB7jwEU4j",
+  "id": "cs_test_NORMALIZED02df7M7uAiMkfDdiM5X1gslDWCW6J7Qi5KqEAKKit5vP7ybc",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "3",
+    "remote_realm_user_id": "2",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuoBDEQaroqDjsjFJHRJXl",
+  "setup_intent": "seti_1OqSoUDEQaroqDjsLMp05KBc",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02IpPaBk0N2zya6kkxLd3rqZCxVa7A3wGYfav1QMB7jwEU4j#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02df7M7uAiMkfDdiM5X1gslDWCW6J7Qi5KqEAKKit5vP7ybc#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.list.1.json
index 4aab3acb78..33156c0a4a 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02IpPaBk0N2zya6kkxLd3rqZCxVa7A3wGYfav1QMB7jwEU4j",
+      "id": "cs_test_NORMALIZED02df7M7uAiMkfDdiM5X1gslDWCW6J7Qi5KqEAKKit5vP7ybc",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "3",
+        "remote_realm_user_id": "2",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuoBDEQaroqDjsjFJHRJXl",
+      "setup_intent": "seti_1OqSoUDEQaroqDjsLMp05KBc",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02IpPaBk0N2zya6kkxLd3rqZCxVa7A3wGYfav1QMB7jwEU4j#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02df7M7uAiMkfDdiM5X1gslDWCW6J7Qi5KqEAKKit5vP7ybc#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.modify.1.json
index a926c01aca..bc8ebe1ce4 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+    "default_payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.1.json
index 84d5eea348..db2dffa57a 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+      "id": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.2.json
index 84d5eea348..db2dffa57a 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+      "id": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.3.json
index 84d5eea348..db2dffa57a 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+      "id": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.4.json
index 84d5eea348..db2dffa57a 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+      "id": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.1.json
index 2df9af0d76..cb0a3f716b 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+            "default_payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuqRDEQaroqDjskvIY9lY7",
+      "id": "evt_1OqSrdDEQaroqDjs4L6lXg2l",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "76d31ad3-3cc0-42a2-9175-f4d6b069869d"
+        "idempotency_key": "0e2987f2-4b76-44b2-b376-4756fce155d1"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.2.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.2.json
index 8fbe40f379..a8033c23f8 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+                "payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 4300,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMXmmK4GMgZVkb8PXCc6LBYk9a7S1FuxZKhY8t373JtD_cljr6kgZCM9IwJCnXIpyBJWTNAE1c4CaaJc?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNeTla8GMgbpy34lap46LBZS8-yGR46aLFyHLqc-Kds0EWEzifu_Adqf8cU3yE7Hl4qUt21rsA08IhVK?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_j7ywoPqrWGVHgRIRXj6zVlHD2",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_W4REpeg5ZqJoHqWVuVijWLYyT",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+          "payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuqUDEQaroqDjs0ct6KW03",
+      "id": "evt_3OqSrhDEQaroqDjs1ebwjpIW",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "657b1b69-e6b8-4a4e-8ea0-d812aa57774b"
+        "idempotency_key": "4783924a-d945-42b9-b932-f63bae36fdf8"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 4300,
+          "amount_captured": 4300,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 4300,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 4300,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNeTla8GMgaR4Z1gerE6LBY6eID9ks47NRfYaOiQKsd0KAajwC4ctiaNfNf4QwibZ08j6ycChl7kJYqS?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSrhDEQaroqDjs14pNB3CB",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "4783924a-d945-42b9-b932-f63bae36fdf8"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY302009QYmjqcU?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2MQ0200VrOVQPfd?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY302009QYmjqcU/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2MQ0200VrOVQPfd/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -307,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -410,16 +540,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuqVDEQaroqDjs8ev4zjzC",
+      "id": "evt_1OqSrhDEQaroqDjsPrICV4zG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "45a3f1d4-c55e-4284-837b-fa2eaf03b807"
+        "idempotency_key": "04dabfa0-bd01-4ef8-aaba-d25a196f34b0"
       },
       "type": "invoice.finalized"
     },
@@ -470,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY302009QYmjqcU?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2MQ0200VrOVQPfd?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY302009QYmjqcU/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2MQ0200VrOVQPfd/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -489,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -539,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -642,7 +774,7 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -662,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OhuqVDEQaroqDjs4gPSur3K",
+      "id": "evt_1OqSrhDEQaroqDjsXcrTQYS9",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "45a3f1d4-c55e-4284-837b-fa2eaf03b807"
+        "idempotency_key": "04dabfa0-bd01-4ef8-aaba-d25a196f34b0"
       },
       "type": "invoice.updated"
     },
@@ -696,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_j7ywoPqrWGVHgRIRXj6zVlHD2",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_W4REpeg5ZqJoHqWVuVijWLYyT",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -739,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuqUDEQaroqDjs0hr7zQDe",
+      "id": "evt_3OqSrhDEQaroqDjs1Xa8MtwT",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "45a3f1d4-c55e-4284-837b-fa2eaf03b807"
+        "idempotency_key": "04dabfa0-bd01-4ef8-aaba-d25a196f34b0"
       },
       "type": "payment_intent.created"
     },
@@ -815,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -865,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -968,16 +1102,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuqUDEQaroqDjsfDM1tmJI",
+      "id": "evt_1OqSrgDEQaroqDjs8aiT1yWE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "5066df8e-eb7c-4ac9-aabc-92dfe71ab94c"
+        "idempotency_key": "fe263572-93dc-4722-b6a4-ceda6eaacbb5"
       },
       "type": "invoice.created"
     },
@@ -1033,13 +1167,13 @@
           "unit_amount_decimal": "-2000"
         }
       },
-      "id": "evt_1OhuqTDEQaroqDjs9z26OVBd",
+      "id": "evt_1OqSrgDEQaroqDjsuZyJN6Cq",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "7bc2895a-d1b3-4fad-882e-c60097d87048"
+        "idempotency_key": "53e9d66e-cd47-4b59-996f-cd4f31651c82"
       },
       "type": "invoiceitem.created"
     },
@@ -1095,13 +1229,13 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1OhuqTDEQaroqDjs2v2lnTbt",
+      "id": "evt_1OqSrfDEQaroqDjsrBOhuyAi",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "590e9703-14b3-4f9d-9325-06f2d90a381f"
+        "idempotency_key": "9070a5d2-20dc-41af-8547-efe2c0099238"
       },
       "type": "invoiceitem.created"
     },
@@ -1124,7 +1258,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+            "default_payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
             "footer": null,
             "rendering_options": null
           },
@@ -1147,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhuqTDEQaroqDjsiwNAyjuF",
+      "id": "evt_1OqSrfDEQaroqDjsRcybFUWX",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "590e9703-14b3-4f9d-9325-06f2d90a381f"
+        "idempotency_key": "9070a5d2-20dc-41af-8547-efe2c0099238"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.3.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.3.json
index ba8dd1931b..8605d801b0 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcw0200Gm9HZMfy?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcw0200Gm9HZMfy/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -222,15 +224,15 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuqYDEQaroqDjsJxhqMFNu",
+      "id": "evt_1OqSrkDEQaroqDjsE6s23iaS",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "657b1b69-e6b8-4a4e-8ea0-d812aa57774b"
+        "idempotency_key": "4783924a-d945-42b9-b932-f63bae36fdf8"
       },
-      "type": "invoice.paid"
+      "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -279,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcw0200Gm9HZMfy?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcw0200Gm9HZMfy/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +300,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +351,241 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 18,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 4300,
+          "subtotal_excluding_tax": 4300,
+          "tax": null,
+          "test_clock": null,
+          "total": 4300,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 4300,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSrjDEQaroqDjsipY8gOpo",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "4783924a-d945-42b9-b932-f63bae36fdf8"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 4300,
+          "amount_paid": 4300,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 6300,
+                "amount_excluding_tax": 6300,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhuqYDEQaroqDjs1HJXkcfB",
+      "id": "evt_1OqSrjDEQaroqDjs3rVHWETb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "657b1b69-e6b8-4a4e-8ea0-d812aa57774b"
+        "idempotency_key": "4783924a-d945-42b9-b932-f63bae36fdf8"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.4.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.4.json
index dd6809bd6a..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 4300,
-          "amount_paid": 4300,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcw0200Gm9HZMfy?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcw0200Gm9HZMfy/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 6300,
-                "amount_excluding_tax": 6300,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 18,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 4300,
-          "subtotal_excluding_tax": 4300,
-          "tax": null,
-          "test_clock": null,
-          "total": 4300,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 4300,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhuqYDEQaroqDjsHDfyab7x",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "657b1b69-e6b8-4a4e-8ea0-d812aa57774b"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.5.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.create.1.json
index 2ee818ce55..f2ec80f992 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.finalize_invoice.1.json
index a24f3a4c29..a9ba5fd128 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY302009QYmjqcU?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2MQ0200VrOVQPfd?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY302009QYmjqcU/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2MQ0200VrOVQPfd/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.list.2.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.list.2.json
index bf571cbad8..305b1bbce9 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcx0200u0vpYq30?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2NA0200Iseq4IAq?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODcx0200u0vpYq30/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2NA0200Iseq4IAq/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.pay.1.json
index fa736cdbc7..90a76a53dd 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY502008Q7Lascd?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvbjI5S2lPMjIxb1k4MW4yNVlGTjAwaEw4dVRvLDk4MDI4ODY502008Q7Lascd/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VZmlEbldiWFAxMkh3eTRvTnBEMk15N0RjZ0RFLDEwMDA2NjI2Mw02001GEE9Zcf/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.create.1.json
index 724fe4b3cd..617b190ced 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuqPDEQaroqDjshrlokFKI_secret_PWyoIigzBUaiMX6ObihdRbtEt9duy9j",
+  "client_secret": "seti_1OqSrbDEQaroqDjs8FvRsZXm_secret_PfoUl3FijBVimvNBE6KOMTEXDyAhcTq",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuqPDEQaroqDjshrlokFKI",
+  "id": "seti_1OqSrbDEQaroqDjs8FvRsZXm",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuqPDEQaroqDjs6NiCSSRD",
+  "latest_attempt": "setatt_1OqSrbDEQaroqDjsRMZA9LQd",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+  "payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.list.1.json
index 6f05001cc5..30e40c6976 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuqODEQaroqDjsCUXruumW_secret_PWyo0aGoTcUwSVFri6gmqZHZ2sYT8eH",
+      "client_secret": "seti_1OqSraDEQaroqDjsEK6zz7XR_secret_PfoU9Amb5VBHvuUZ0pEOlk8hCz1jAMv",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuqODEQaroqDjsCUXruumW",
+      "id": "seti_1OqSraDEQaroqDjsEK6zz7XR",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.retrieve.1.json
index 724fe4b3cd..617b190ced 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuqPDEQaroqDjshrlokFKI_secret_PWyoIigzBUaiMX6ObihdRbtEt9duy9j",
+  "client_secret": "seti_1OqSrbDEQaroqDjs8FvRsZXm_secret_PfoUl3FijBVimvNBE6KOMTEXDyAhcTq",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuqPDEQaroqDjshrlokFKI",
+  "id": "seti_1OqSrbDEQaroqDjs8FvRsZXm",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuqPDEQaroqDjs6NiCSSRD",
+  "latest_attempt": "setatt_1OqSrbDEQaroqDjsRMZA9LQd",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuqPDEQaroqDjsHtreBTeP",
+  "payment_method": "pm_1OqSrbDEQaroqDjsgEI2jDjM",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.create.1.json
index 5f3553d26a..385f271022 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED025lLZWoNt6qqb61131mH8KrywT5EYtY2qtij5W7TuuaBqI4",
+  "id": "cs_test_NORMALIZED023FoJJwIVPY1Bzihz9pAgxSxbxuvFae250BsHsxVc9AIKim",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "4",
+    "remote_server_user_id": "5",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuqODEQaroqDjsCUXruumW",
+  "setup_intent": "seti_1OqSraDEQaroqDjsEK6zz7XR",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED025lLZWoNt6qqb61131mH8KrywT5EYtY2qtij5W7TuuaBqI4#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED023FoJJwIVPY1Bzihz9pAgxSxbxuvFae250BsHsxVc9AIKim#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.list.1.json
index 205e1dce2f..7ad26d6668 100644
--- a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED025lLZWoNt6qqb61131mH8KrywT5EYtY2qtij5W7TuuaBqI4",
+      "id": "cs_test_NORMALIZED023FoJJwIVPY1Bzihz9pAgxSxbxuvFae250BsHsxVc9AIKim",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "4",
+        "remote_server_user_id": "5",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuqODEQaroqDjsCUXruumW",
+      "setup_intent": "seti_1OqSraDEQaroqDjsEK6zz7XR",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED025lLZWoNt6qqb61131mH8KrywT5EYtY2qtij5W7TuuaBqI4#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED023FoJJwIVPY1Bzihz9pAgxSxbxuvFae250BsHsxVc9AIKim#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.modify.1.json
index 6156c2b9d2..a066d6978a 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+    "default_payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.1.json
index 72e72b6cf6..4342b827a0 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+      "id": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.2.json
index 72e72b6cf6..4342b827a0 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+      "id": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.3.json
index 72e72b6cf6..4342b827a0 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+      "id": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.1.json
index bceaf8a5eb..04b79e3b64 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+            "default_payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhukkDEQaroqDjsXNh6ANqf",
+      "id": "evt_1OqSl5DEQaroqDjsG1abus1J",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "c03d8e9f-6323-477c-bb45-3157d84cb04c"
+        "idempotency_key": "cdbef0fe-1ff8-4109-a6d6-5e83777c5c7e"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.2.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.2.json
index 50567cbf15..0f2f48b1d2 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+                "payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOPjmK4GMgZuQcZg_Mg6LBaeqYl4_sSrQt8dNfSER36W7onF-Ghds-24f5Y5kuSSHTHXOurfOHdLhMSk?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMCQla8GMgaQIt1Flzw6LBZSEvDnWeJ7lINZBhWyx-Te6KJ9Fq-T03Vij7foJZcxaIRb5EWgR94TZd6-?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_lfVSSG8LhNc8sCYm4DGmtbyPC",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_T9lNRZ8eL8ShYBHSvEvWsMBpQ",
           "confirmation_method": "automatic",
           "created": 1010000006,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+          "payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuknDEQaroqDjs1noDjlzp",
+      "id": "evt_3OqSl8DEQaroqDjs1HLtwLvr",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b4dfbdea-e396-4c0c-ac41-bd793782f087"
+        "idempotency_key": "02e82f68-e44a-41ba-a0cd-69c717989e63"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+          "payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
           "payment_method_details": {
             "card": {
               "amount_authorized": 48000,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOPjmK4GMgaLm9741wE6LBZcCc_CvGcwV4M_raPjy6zQXKWSB2J_Y4uqeiKMGemHVhJd2Onl04ylgzzS?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMCQla8GMgYBJmKQ6bw6LBZ4JVY2l6QUXmGoBil60HLGFWmWS6J8SNerkmEUQIXHmEDDs4-5GqRnzKVT?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuknDEQaroqDjs18izhvXD",
+      "id": "evt_3OqSl8DEQaroqDjs1lL94m6n",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b4dfbdea-e396-4c0c-ac41-bd793782f087"
+        "idempotency_key": "02e82f68-e44a-41ba-a0cd-69c717989e63"
       },
       "type": "charge.succeeded"
     },
@@ -344,7 +344,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000007,
+          "created": 1010000006,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE0020089vi3CK7?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1NQ02002S57EJhz?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE0020089vi3CK7/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1NQ02002S57EJhz/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -397,7 +398,7 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000008,
+                  "created": 1010000007,
                   "currency": "usd",
                   "custom_unit_amount": null,
                   "id": "price_NORMALIZED00000000000001",
@@ -492,13 +493,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhukoDEQaroqDjsxy2S5oCK",
+      "id": "evt_1OqSl9DEQaroqDjsAgXc2u2K",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "30e33318-4c96-4aa0-a4c1-c76d49b0f079"
+        "idempotency_key": "43b4bcf5-f9d9-46b8-a959-023276ff7fe0"
       },
       "type": "invoice.finalized"
     },
@@ -527,7 +528,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000007,
+          "created": 1010000006,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -549,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTEz0200tOdVMBsL?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1NQ02002S57EJhz?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTEz0200tOdVMBsL/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1NQ02002S57EJhz/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -568,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -580,7 +582,7 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000008,
+                  "created": 1010000007,
                   "currency": "usd",
                   "custom_unit_amount": null,
                   "id": "price_NORMALIZED00000000000001",
@@ -692,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhuknDEQaroqDjsXcnEipMt",
+      "id": "evt_1OqSl9DEQaroqDjsdaVhDQsO",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "30e33318-4c96-4aa0-a4c1-c76d49b0f079"
+        "idempotency_key": "43b4bcf5-f9d9-46b8-a959-023276ff7fe0"
       },
       "type": "invoice.updated"
     },
@@ -726,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_lfVSSG8LhNc8sCYm4DGmtbyPC",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_T9lNRZ8eL8ShYBHSvEvWsMBpQ",
           "confirmation_method": "automatic",
           "created": 1010000006,
           "currency": "usd",
@@ -769,19 +771,19 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuknDEQaroqDjs18eObksO",
+      "id": "evt_3OqSl8DEQaroqDjs1bUR3Z6g",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "30e33318-4c96-4aa0-a4c1-c76d49b0f079"
+        "idempotency_key": "43b4bcf5-f9d9-46b8-a959-023276ff7fe0"
       },
       "type": "payment_intent.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000007,
+      "created": 1010000006,
       "data": {
         "object": {
           "account_country": "US",
@@ -804,7 +806,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000007,
+          "created": 1010000006,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -845,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -857,7 +860,7 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000008,
+                  "created": 1010000007,
                   "currency": "usd",
                   "custom_unit_amount": null,
                   "id": "price_NORMALIZED00000000000001",
@@ -949,22 +952,22 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhukmDEQaroqDjsjOV9lo3S",
+      "id": "evt_1OqSl8DEQaroqDjsFmRFi232",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "be773782-c4b7-4e23-a693-aaf48b6bc08a"
+        "idempotency_key": "ada65a66-6b04-46d3-89fb-b3bde2bce749"
       },
       "type": "invoice.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000007,
+      "created": 1010000008,
       "data": {
         "object": {
           "amount": 48000,
@@ -987,7 +990,7 @@
           "price": {
             "active": false,
             "billing_scheme": "per_unit",
-            "created": 1010000008,
+            "created": 1010000007,
             "currency": "usd",
             "custom_unit_amount": null,
             "id": "price_NORMALIZED00000000000001",
@@ -1014,19 +1017,19 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhukmDEQaroqDjsnVMG0GRk",
+      "id": "evt_1OqSl7DEQaroqDjs2A2ViIch",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "73ea8372-c8f7-4f9e-b4e7-ccc3d2623c95"
+        "idempotency_key": "2cf793d0-3466-4c7a-987f-20650dec9d83"
       },
       "type": "invoiceitem.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000007,
+      "created": 1010000008,
       "data": {
         "object": {
           "address": null,
@@ -1043,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+            "default_payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
             "footer": null,
             "rendering_options": null
           },
@@ -1066,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhukmDEQaroqDjsb8GuZto5",
+      "id": "evt_1OqSl7DEQaroqDjsKyuoP5Xa",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "73ea8372-c8f7-4f9e-b4e7-ccc3d2623c95"
+        "idempotency_key": "2cf793d0-3466-4c7a-987f-20650dec9d83"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.3.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.3.json
index 9e0633c515..e5d3156651 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.3.json
@@ -25,7 +25,7 @@
           "billing_reason": "manual",
           "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1010000007,
+          "created": 1010000006,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE20200ZG9UJxeB?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Nw0200Nz2nDKU4?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE20200ZG9UJxeB/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Nw0200Nz2nDKU4/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -78,7 +79,7 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000008,
+                  "created": 1010000007,
                   "currency": "usd",
                   "custom_unit_amount": null,
                   "id": "price_NORMALIZED00000000000001",
@@ -173,13 +174,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhukqDEQaroqDjsK3EIaAXj",
+      "id": "evt_1OqSlBDEQaroqDjsnwK3Yx0J",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b4dfbdea-e396-4c0c-ac41-bd793782f087"
+        "idempotency_key": "02e82f68-e44a-41ba-a0cd-69c717989e63"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -208,7 +209,7 @@
           "billing_reason": "manual",
           "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1010000007,
+          "created": 1010000006,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE20200ZG9UJxeB?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Ng0200CYMSUNHZ?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE20200ZG9UJxeB/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Ng0200CYMSUNHZ/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +250,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -261,7 +263,7 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000008,
+                  "created": 1010000007,
                   "currency": "usd",
                   "custom_unit_amount": null,
                   "id": "price_NORMALIZED00000000000001",
@@ -356,13 +358,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhukqDEQaroqDjs8DK95lXE",
+      "id": "evt_1OqSlBDEQaroqDjstZsrFoox",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b4dfbdea-e396-4c0c-ac41-bd793782f087"
+        "idempotency_key": "02e82f68-e44a-41ba-a0cd-69c717989e63"
       },
       "type": "invoice.paid"
     },
@@ -391,7 +393,7 @@
           "billing_reason": "manual",
           "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1010000007,
+          "created": 1010000006,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -413,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE10200emKr6nH1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Ng0200CYMSUNHZ?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE10200emKr6nH1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Ng0200CYMSUNHZ/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -432,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -444,7 +447,7 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000008,
+                  "created": 1010000007,
                   "currency": "usd",
                   "custom_unit_amount": null,
                   "id": "price_NORMALIZED00000000000001",
@@ -551,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhukpDEQaroqDjsMGD3B7NM",
+      "id": "evt_1OqSlADEQaroqDjsTzqZ9hFm",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b4dfbdea-e396-4c0c-ac41-bd793782f087"
+        "idempotency_key": "02e82f68-e44a-41ba-a0cd-69c717989e63"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.create.1.json
index b3ec5b9961..cb67b37afc 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.create.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000007,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000008,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000001",
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.finalize_invoice.1.json
index b401e56808..7d760b83b4 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.finalize_invoice.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000007,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTEz0200tOdVMBsL?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1NA0200PgxvV0fX?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTEz0200tOdVMBsL/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1NA0200PgxvV0fX/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000008,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000001",
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.pay.1.json
index a7bda890e5..d6559357f6 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.pay.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": "ch_NORMALIZED00000000000001",
   "collection_method": "charge_automatically",
-  "created": 1010000007,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE10200emKr6nH1?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Ng0200CYMSUNHZ?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpUzJyUnRyYW90Q2xiVkN1T1RIcXBNNXQ2ZXVCLDk4MDI4NTE10200emKr6nH1/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OczVTR0x0Q0ViRm1vaUNrRlJReWdxTHBtbTJGLDEwMDA2NTg1Ng0200CYMSUNHZ/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000008,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000001",
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--InvoiceItem.create.1.json
index c9255a8599..95e8b61cc9 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--InvoiceItem.create.1.json
@@ -19,7 +19,7 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000008,
+    "created": 1010000007,
     "currency": "usd",
     "custom_unit_amount": null,
     "id": "price_NORMALIZED00000000000001",
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.create.1.json
index d71e123cd8..161f2bd994 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhukiDEQaroqDjs0xT1oJsa_secret_PWyiU3RQ2gDtrAbZqO65T2xJe6LkEuc",
+  "client_secret": "seti_1OqSl4DEQaroqDjsUsQ6yO72_secret_PfoNcK1snfpB7wey7w1MpRSR6mtaz3g",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhukiDEQaroqDjs0xT1oJsa",
+  "id": "seti_1OqSl4DEQaroqDjsUsQ6yO72",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhukiDEQaroqDjsP3ytOt0I",
+  "latest_attempt": "setatt_1OqSl4DEQaroqDjsjpYFOqOj",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+  "payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.list.1.json
index 4b6d95dfe7..49a2d9c1fd 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhukhDEQaroqDjsDlSjhcp0_secret_PWyioprocLEzfPGeblkSQQBMeWmmqKC",
-      "created": 1010000001,
+      "client_secret": "seti_1OqSl3DEQaroqDjsq8b5NCel_secret_PfoNvOnGksc6fEK3cimu3DsDBRXHqAz",
+      "created": 1010000009,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhukhDEQaroqDjsDlSjhcp0",
+      "id": "seti_1OqSl3DEQaroqDjsq8b5NCel",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.retrieve.1.json
index d71e123cd8..161f2bd994 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhukiDEQaroqDjs0xT1oJsa_secret_PWyiU3RQ2gDtrAbZqO65T2xJe6LkEuc",
+  "client_secret": "seti_1OqSl4DEQaroqDjsUsQ6yO72_secret_PfoNcK1snfpB7wey7w1MpRSR6mtaz3g",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhukiDEQaroqDjs0xT1oJsa",
+  "id": "seti_1OqSl4DEQaroqDjsUsQ6yO72",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhukiDEQaroqDjsP3ytOt0I",
+  "latest_attempt": "setatt_1OqSl4DEQaroqDjsjpYFOqOj",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhukiDEQaroqDjsZKV2BB4w",
+  "payment_method": "pm_1OqSl4DEQaroqDjsMIjHZw8x",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.create.1.json
index f38054ad37..848da96d4e 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000001,
+  "created": 1010000009,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02fE5NMQ4AvWmQEXQir4oNaRnaKzUCW8Bxgzj1raxvfD4qKG",
+  "id": "cs_test_NORMALIZED028fBAeuged7nAlPqwzWhkNUUVinnLXxeOgRS9WtuLJYjy6A",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhukhDEQaroqDjsDlSjhcp0",
+  "setup_intent": "seti_1OqSl3DEQaroqDjsq8b5NCel",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02fE5NMQ4AvWmQEXQir4oNaRnaKzUCW8Bxgzj1raxvfD4qKG#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028fBAeuged7nAlPqwzWhkNUUVinnLXxeOgRS9WtuLJYjy6A#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.list.1.json
index 9254b9ff70..1d2b6bbda6 100644
--- a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000001,
+      "created": 1010000009,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02fE5NMQ4AvWmQEXQir4oNaRnaKzUCW8Bxgzj1raxvfD4qKG",
+      "id": "cs_test_NORMALIZED028fBAeuged7nAlPqwzWhkNUUVinnLXxeOgRS9WtuLJYjy6A",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhukhDEQaroqDjsDlSjhcp0",
+      "setup_intent": "seti_1OqSl3DEQaroqDjsq8b5NCel",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02fE5NMQ4AvWmQEXQir4oNaRnaKzUCW8Bxgzj1raxvfD4qKG#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028fBAeuged7nAlPqwzWhkNUUVinnLXxeOgRS9WtuLJYjy6A#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_plan--Customer.modify.1.json
index 6d00bc246d..816eb2d74f 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+    "default_payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.1.json
index 23e13e0efc..4091947c10 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+      "id": "pm_1OqSipDEQaroqDjsYERSX0N3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.2.json
index 23e13e0efc..4091947c10 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+      "id": "pm_1OqSipDEQaroqDjsYERSX0N3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.3.json
index 23e13e0efc..4091947c10 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+      "id": "pm_1OqSipDEQaroqDjsYERSX0N3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.4.json
index 23e13e0efc..4091947c10 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+      "id": "pm_1OqSipDEQaroqDjsYERSX0N3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.1.json
index c2efb8ab87..66d008db58 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+            "default_payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuiFDEQaroqDjsuFaVNZY3",
+      "id": "evt_1OqSirDEQaroqDjsHdxoXGsU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "641fd26b-a11f-43e1-8e38-a001da776fb0"
+        "idempotency_key": "742c9b10-22da-4b31-8d93-b9b4e92db87c"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.2.json
index 06e6b2835d..9f6e87c7bd 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+                "payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMnimK4GMgYcrkfQ5nA6LBZGDrxzOF_ZT_hc-16Y6xcpY-yq3riY2p5yET9tj0hIROB24l29iIOQKqWd?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLaPla8GMgYd_kM0I9E6LBYE6JHsKSB0MIfgi8TFOVH91bBSJj_Ahr-q5GVJTEKLMD1rf2iU0NQzgyIr?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_cdiYYEZz8MmmEhvhWlhIP7yYb",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_y93Qg5Fn1VS0hsDhdaJgPDukz",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+          "payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuiJDEQaroqDjs1BYHVtPt",
+      "id": "evt_3OqSiuDEQaroqDjs05z4AyTR",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b153a25e-f4fe-47ed-822b-77a461516d7d"
+        "idempotency_key": "31b38e2a-69c1-494b-8477-5e8499f8b20e"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLaPla8GMgbyWeC5-SY6LBaugctXtxMjR7ZdvoF8CT9Lu4-wTwUNop0hyHnoOJKc7jmFWnLuKo-44wkj?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSiuDEQaroqDjs0Apmj9w0",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "31b38e2a-69c1-494b-8477-5e8499f8b20e"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzU50200qV9H0ai8?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxNw0200eTjOxyVB?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzU50200qV9H0ai8/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxNw0200eTjOxyVB/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -361,16 +490,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuiJDEQaroqDjsiAogMRU5",
+      "id": "evt_1OqSivDEQaroqDjsVbZfHBBF",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "8646f0a3-949e-4445-b4b7-7eb1947ad888"
+        "idempotency_key": "04a006c1-012e-4b54-b93c-98bbf93781fd"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzU50200qV9H0ai8?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxNw0200eTjOxyVB?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzU50200qV9H0ai8/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxNw0200eTjOxyVB/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -544,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhuiJDEQaroqDjsb348H15i",
+      "id": "evt_1OqSivDEQaroqDjsnx1bfBCz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "8646f0a3-949e-4445-b4b7-7eb1947ad888"
+        "idempotency_key": "04a006c1-012e-4b54-b93c-98bbf93781fd"
       },
       "type": "invoice.updated"
     },
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_cdiYYEZz8MmmEhvhWlhIP7yYb",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_y93Qg5Fn1VS0hsDhdaJgPDukz",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuiJDEQaroqDjs1gffeTCB",
+      "id": "evt_3OqSiuDEQaroqDjs01dYSYOC",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "8646f0a3-949e-4445-b4b7-7eb1947ad888"
+        "idempotency_key": "04a006c1-012e-4b54-b93c-98bbf93781fd"
       },
       "type": "payment_intent.created"
     },
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -821,16 +952,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuiIDEQaroqDjsyNrAMtzP",
+      "id": "evt_1OqSiuDEQaroqDjsUJ68UpoD",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "25ad856b-8562-4403-ba3b-dcea20c89dfb"
+        "idempotency_key": "0c51ac54-097e-4823-9d1f-fc1a730a8d27"
       },
       "type": "invoice.created"
     },
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhuiIDEQaroqDjs6npMzIyM",
+      "id": "evt_1OqSitDEQaroqDjs1Iq37A5i",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "f7014e47-808c-4b38-bbe8-7381a1a7fb68"
+        "idempotency_key": "ab08ef24-0757-4377-93d3-5b41674bb53b"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+            "default_payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhuiIDEQaroqDjsC0RHtvKu",
+      "id": "evt_1OqSitDEQaroqDjsWQA7uuzA",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "f7014e47-808c-4b38-bbe8-7381a1a7fb68"
+        "idempotency_key": "ab08ef24-0757-4377-93d3-5b41674bb53b"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.3.json
index 75fe3370dd..8acbed9d9d 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOQ0200512eDgSO?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOQ0200512eDgSO/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuiLDEQaroqDjsfDbpYER0",
+      "id": "evt_1OqSixDEQaroqDjsSJ9MfkSo",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b153a25e-f4fe-47ed-822b-77a461516d7d"
+        "idempotency_key": "31b38e2a-69c1-494b-8477-5e8499f8b20e"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOQ0200512eDgSO?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOQ0200512eDgSO/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +250,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -356,13 +358,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuiLDEQaroqDjsqLDa1dlE",
+      "id": "evt_1OqSixDEQaroqDjsU841kHyE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b153a25e-f4fe-47ed-822b-77a461516d7d"
+        "idempotency_key": "31b38e2a-69c1-494b-8477-5e8499f8b20e"
       },
       "type": "invoice.paid"
     },
@@ -413,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOQ0200512eDgSO?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOQ0200512eDgSO/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -432,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -551,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhuiLDEQaroqDjsSO49YGFX",
+      "id": "evt_1OqSixDEQaroqDjszOoE3LL0",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "b153a25e-f4fe-47ed-822b-77a461516d7d"
+        "idempotency_key": "31b38e2a-69c1-494b-8477-5e8499f8b20e"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.1.json
index f4f30938d0..347fe6644d 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.2.json b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.2.json
index c9bac2e7fd..f706e9b7a2 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -160,6 +162,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -258,5 +261,5 @@
   "total_excluding_tax": 80697,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.1.json
index 2ec5ea1ba4..349471996c 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzU50200qV9H0ai8?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxNw0200eTjOxyVB?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzU50200qV9H0ai8/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxNw0200eTjOxyVB/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.2.json
index 8df2c4d0a4..d3da2cc996 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmQk1aeWM4S3F2cHFTdGs4MzJJM0U1VXNhVUpxLDk4MDI4MzY00200xRVyhxfJ?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Mano0MVZKYktJNDJrTmRvUkhoVnJhU3A3ZVdqLDEwMDA2NTcyMg0200fKK8Z6jE?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmQk1aeWM4S3F2cHFTdGs4MzJJM0U1VXNhVUpxLDk4MDI4MzY00200xRVyhxfJ/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Mano0MVZKYktJNDJrTmRvUkhoVnJhU3A3ZVdqLDEwMDA2NTcyMg0200fKK8Z6jE/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -160,6 +162,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -258,5 +261,5 @@
   "total_excluding_tax": 80697,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.list.2.json b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.list.2.json
index 841129e2a7..721bb0bd18 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmQk1aeWM4S3F2cHFTdGs4MzJJM0U1VXNhVUpxLDk4MDI4MzY10200yDp4EfuG?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Mano0MVZKYktJNDJrTmRvUkhoVnJhU3A3ZVdqLDEwMDA2NTcyMw0200Lb0QrX0R?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmQk1aeWM4S3F2cHFTdGs4MzJJM0U1VXNhVUpxLDk4MDI4MzY10200yDp4EfuG/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Mano0MVZKYktJNDJrTmRvUkhoVnJhU3A3ZVdqLDEwMDA2NTcyMw0200Lb0QrX0R/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -162,6 +164,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -305,9 +308,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzY10200ZzuiwuX2?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcyMw0200Q42uY3Ku?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzY10200ZzuiwuX2/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcyMw0200Q42uY3Ku/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -324,6 +327,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.pay.1.json
index b5b31b51cf..cdf71e3927 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOA0200C3soQHJE?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lmTGlZNXpWYWpPUGFFTmo3RDRtam44YUtHVmpJLDk4MDI4MzYx0200o6Y6dl9d/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9MRnZxSkdpU25ObEtDZlpzVkNOeUFROXUyaXpTLDEwMDA2NTcxOA0200C3soQHJE/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.create.1.json
index 932889d46b..47df2bc160 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuiDDEQaroqDjsyj0PemZZ_secret_PWyfNmTze6BtIvfzBpWNsT5fdHhEumQ",
+  "client_secret": "seti_1OqSipDEQaroqDjsyT40PyUx_secret_PfoLtyEopz3s4DgnH9pvDHZgQZh0o2l",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuiDDEQaroqDjsyj0PemZZ",
+  "id": "seti_1OqSipDEQaroqDjsyT40PyUx",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuiDDEQaroqDjsUAP1R3n7",
+  "latest_attempt": "setatt_1OqSipDEQaroqDjs1AjDlutD",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+  "payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.list.1.json
index c81aea17f5..82d537d61b 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuiDDEQaroqDjskQXITcc1_secret_PWyfzONMMxeegMQ6pTS9dlQHyElvokb",
+      "client_secret": "seti_1OqSipDEQaroqDjsvkiwBqjp_secret_PfoLG54ol2q994ZxcNsHRLTLw5ddYDc",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuiDDEQaroqDjskQXITcc1",
+      "id": "seti_1OqSipDEQaroqDjsvkiwBqjp",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.retrieve.1.json
index 932889d46b..47df2bc160 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuiDDEQaroqDjsyj0PemZZ_secret_PWyfNmTze6BtIvfzBpWNsT5fdHhEumQ",
+  "client_secret": "seti_1OqSipDEQaroqDjsyT40PyUx_secret_PfoLtyEopz3s4DgnH9pvDHZgQZh0o2l",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuiDDEQaroqDjsyj0PemZZ",
+  "id": "seti_1OqSipDEQaroqDjsyT40PyUx",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuiDDEQaroqDjsUAP1R3n7",
+  "latest_attempt": "setatt_1OqSipDEQaroqDjs1AjDlutD",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuiDDEQaroqDjswTC2mcXV",
+  "payment_method": "pm_1OqSipDEQaroqDjsYERSX0N3",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.create.1.json
index 557d931fc7..eab663158e 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02a5HXeRIwlMlPcLjB3vrIvRSw7QT7AimfrKb0ILrWHeEUtD",
+  "id": "cs_test_NORMALIZED0229xluxVRaSKkv1HtpLbMTVYiCdVtTjjXW3KbfAV8kKv9rX",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuiDDEQaroqDjskQXITcc1",
+  "setup_intent": "seti_1OqSipDEQaroqDjsvkiwBqjp",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02a5HXeRIwlMlPcLjB3vrIvRSw7QT7AimfrKb0ILrWHeEUtD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED0229xluxVRaSKkv1HtpLbMTVYiCdVtTjjXW3KbfAV8kKv9rX#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.list.1.json
index 731f76fbb3..e3508ebbde 100644
--- a/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02a5HXeRIwlMlPcLjB3vrIvRSw7QT7AimfrKb0ILrWHeEUtD",
+      "id": "cs_test_NORMALIZED0229xluxVRaSKkv1HtpLbMTVYiCdVtTjjXW3KbfAV8kKv9rX",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuiDDEQaroqDjskQXITcc1",
+      "setup_intent": "seti_1OqSipDEQaroqDjsvkiwBqjp",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02a5HXeRIwlMlPcLjB3vrIvRSw7QT7AimfrKb0ILrWHeEUtD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED0229xluxVRaSKkv1HtpLbMTVYiCdVtTjjXW3KbfAV8kKv9rX#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.create.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.modify.1.json
index 517839b63d..bea55cc0f5 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+    "default_payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.1.json
index 013856ad7e..6cdf090ae7 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+      "id": "pm_1OqSogDEQaroqDjsSyvJycji",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.2.json
index 013856ad7e..6cdf090ae7 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+      "id": "pm_1OqSogDEQaroqDjsSyvJycji",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.3.json
index 013856ad7e..6cdf090ae7 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+      "id": "pm_1OqSogDEQaroqDjsSyvJycji",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.4.json
index 013856ad7e..6cdf090ae7 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+      "id": "pm_1OqSogDEQaroqDjsSyvJycji",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.1.json
index e46c6248d9..ead2b9b1c9 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+            "default_payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuoQDEQaroqDjsFwRfiwXM",
+      "id": "evt_1OqSoiDEQaroqDjsv5xkAfIq",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "f0cbcbed-57ad-4ad1-b995-185653795062"
+        "idempotency_key": "023338f5-df16-4b6e-9d8a-a2cbcbfb3363"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.2.json
index e72c42e197..2636125bcb 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+                "payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 1850,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMjlmK4GMga2NYuH8406LBZaeQCO1DHElLhZRz8gNFJfAaRSFxwEUbTAXRwiAj7Dd-St37E52jr5mKUs?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKKSla8GMgadvIJF_Kk6LBbkzQP3xI7tdyUXy2SmK4cq0-PNsc4ro0FYL0xbtLVOdFSPO9UQzvOBx9lO?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_Bz13cPp9Mbpu53ePouGrmomOg",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_psJ5xLjdzf6VsBpvzdeDlMZ3w",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+          "payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuoUDEQaroqDjs0P6LBRDs",
+      "id": "evt_3OqSomDEQaroqDjs0h92HPXI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f5752615-2a7f-47b5-ba40-a5918db7148f"
+        "idempotency_key": "ac4dd1a2-870c-44d3-9173-2c8a8c18ce0d"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+          "payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
           "payment_method_details": {
             "card": {
               "amount_authorized": 1850,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMjlmK4GMgYAW6qnxh86LBasaNYRfr3txWDUPw7rVNF18z1k21NrWpzVy2Uyh8rtD92oqd3rAatETRRw?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKKSla8GMgaeylq5j_U6LBZOvNMlmN-2qGQD9BsvoygOcrNa8Uif5_wZX6wrkF9wiuiofLRWLmKHuJ2D?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuoUDEQaroqDjs0cQ6eGKW",
+      "id": "evt_3OqSomDEQaroqDjs0S1hyWz5",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f5752615-2a7f-47b5-ba40-a5918db7148f"
+        "idempotency_key": "ac4dd1a2-870c-44d3-9173-2c8a8c18ce0d"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQz0200ILYcChSA?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4MQ0200qxGUUefp?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQz0200ILYcChSA/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4MQ0200qxGUUefp/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -435,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -538,16 +540,16 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuoVDEQaroqDjsu8vSjAFl",
+      "id": "evt_1OqSonDEQaroqDjsVznt6O1O",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "53a9fac0-c5d4-4974-b49f-5f872dc93c11"
+        "idempotency_key": "4ffdda33-bf3c-41dd-b767-b03a560c22c6"
       },
       "type": "invoice.finalized"
     },
@@ -598,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQy0200ZDrtyCmv?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4MA0200vjSemt7t?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQy0200ZDrtyCmv/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4MA0200vjSemt7t/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -617,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -667,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -770,7 +774,7 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -790,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OhuoVDEQaroqDjsPeYUvStz",
+      "id": "evt_1OqSonDEQaroqDjsj7w38LGd",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "53a9fac0-c5d4-4974-b49f-5f872dc93c11"
+        "idempotency_key": "4ffdda33-bf3c-41dd-b767-b03a560c22c6"
       },
       "type": "invoice.updated"
     },
@@ -824,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_Bz13cPp9Mbpu53ePouGrmomOg",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_psJ5xLjdzf6VsBpvzdeDlMZ3w",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -867,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuoUDEQaroqDjs0Lk6v47r",
+      "id": "evt_3OqSomDEQaroqDjs0Jq1Hwdz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "53a9fac0-c5d4-4974-b49f-5f872dc93c11"
+        "idempotency_key": "4ffdda33-bf3c-41dd-b767-b03a560c22c6"
       },
       "type": "payment_intent.created"
     },
@@ -943,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -993,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -1096,16 +1102,16 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuoTDEQaroqDjscq4a5tmT",
+      "id": "evt_1OqSomDEQaroqDjsY83GVX9W",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "6776d3bd-2ca8-4780-952a-78ee7b3476fc"
+        "idempotency_key": "21098628-9e41-40cc-a663-20c81efb6188"
       },
       "type": "invoice.created"
     },
@@ -1161,13 +1167,13 @@
           "unit_amount_decimal": "-2000"
         }
       },
-      "id": "evt_1OhuoTDEQaroqDjsn1pWmEo4",
+      "id": "evt_1OqSolDEQaroqDjs5uukNvzU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "2495468f-6b0e-4411-bab9-96d2f2df048a"
+        "idempotency_key": "6fe50d99-d171-438a-84de-09f195316e07"
       },
       "type": "invoiceitem.created"
     },
@@ -1223,13 +1229,13 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1OhuoTDEQaroqDjsCI6EJyhJ",
+      "id": "evt_1OqSolDEQaroqDjspd9TGcer",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "543736fc-2dad-451e-b8a6-5b85cbad1d16"
+        "idempotency_key": "dde92248-db8d-4514-8c66-9ec145469e2f"
       },
       "type": "invoiceitem.created"
     },
@@ -1245,21 +1251,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+            "default_payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1275,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhuoSDEQaroqDjsZFhTj1ma",
+      "id": "evt_1OqSolDEQaroqDjsadylzOCB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "543736fc-2dad-451e-b8a6-5b85cbad1d16"
+        "idempotency_key": "dde92248-db8d-4514-8c66-9ec145469e2f"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.3.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.3.json
index 5fa62c27b4..d2ac435569 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ10200mBrBgcuW?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mw0200FuO8hN6I?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ10200mBrBgcuW/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mw0200FuO8hN6I/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -219,16 +221,250 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuoXDEQaroqDjsm2t5Uv8x",
+      "id": "evt_1OqSopDEQaroqDjsafu25tyE",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f5752615-2a7f-47b5-ba40-a5918db7148f"
+        "idempotency_key": "ac4dd1a2-870c-44d3-9173-2c8a8c18ce0d"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 1850,
+          "amount_paid": 1850,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mw0200FuO8hN6I?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mw0200FuO8hN6I/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 3850,
+                "amount_excluding_tax": 3850,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 11,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "11",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 1850,
+          "subtotal_excluding_tax": 1850,
+          "tax": null,
+          "test_clock": null,
+          "total": 1850,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 1850,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSopDEQaroqDjsOcKCLJWO",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "ac4dd1a2-870c-44d3-9173-2c8a8c18ce0d"
       },
       "type": "invoice.paid"
     },
@@ -279,9 +515,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ00200UpuhUuvW?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mg0200vxlhxAWv?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ00200UpuhUuvW/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mg0200vxlhxAWv/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +534,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +585,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -451,7 +689,7 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhuoXDEQaroqDjsodWtgkaF",
+      "id": "evt_1OqSopDEQaroqDjscI3SFTp4",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f5752615-2a7f-47b5-ba40-a5918db7148f"
+        "idempotency_key": "ac4dd1a2-870c-44d3-9173-2c8a8c18ce0d"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.4.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.4.json
index 32f3923a81..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 1850,
-          "amount_paid": 1850,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ10200mBrBgcuW?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ10200mBrBgcuW/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 3850,
-                "amount_excluding_tax": 3850,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 11,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "11",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 1850,
-          "subtotal_excluding_tax": 1850,
-          "tax": null,
-          "test_clock": null,
-          "total": 1850,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 1850,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhuoXDEQaroqDjso9bvOvHz",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "f5752615-2a7f-47b5-ba40-a5918db7148f"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.5.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.1.json
index ce7570d59a..9880df0479 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.2.json
index 135265bce4..602986ca5e 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -160,6 +162,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -258,5 +261,5 @@
   "total_excluding_tax": 5235,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.1.json
index c1e94f0de2..900e4f95d9 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQy0200ZDrtyCmv?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4MA0200vjSemt7t?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQy0200ZDrtyCmv/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4MA0200vjSemt7t/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.2.json
index efd8ed633a..96a69f5174 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltQ2tabXVOZ3I5T0h6eEhPOXVMc3Y3UFE0c0tFLDk4MDI4NzQ50200COFQSUNR?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SeVR5WDN6dDhOYTI0MTdEeTY0M2gwYzVzcGptLDEwMDA2NjA4Nw0200YULTltNx?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltQ2tabXVOZ3I5T0h6eEhPOXVMc3Y3UFE0c0tFLDk4MDI4NzQ50200COFQSUNR/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SeVR5WDN6dDhOYTI0MTdEeTY0M2gwYzVzcGptLDEwMDA2NjA4Nw0200YULTltNx/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -160,6 +162,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -258,5 +261,5 @@
   "total_excluding_tax": 5235,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.list.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.list.2.json
index d621362edf..cc714df1b5 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltQ2tabXVOZ3I5T0h6eEhPOXVMc3Y3UFE0c0tFLDk4MDI4NzQ50200COFQSUNR?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SeVR5WDN6dDhOYTI0MTdEeTY0M2gwYzVzcGptLDEwMDA2NjA4Nw0200YULTltNx?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltQ2tabXVOZ3I5T0h6eEhPOXVMc3Y3UFE0c0tFLDk4MDI4NzQ50200COFQSUNR/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SeVR5WDN6dDhOYTI0MTdEeTY0M2gwYzVzcGptLDEwMDA2NjA4Nw0200YULTltNx/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -162,6 +164,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000005",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000005",
             "livemode": false,
             "metadata": {},
@@ -260,7 +263,7 @@
       "total_excluding_tax": 5235,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -305,9 +308,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ50200P5vOoVBb?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Nw0200vIFYRQK6?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ50200P5vOoVBb/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Nw0200vIFYRQK6/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -324,6 +327,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -374,6 +378,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.pay.1.json
index 7ad1528937..baba6340cf 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ00200UpuhUuvW?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mg0200vxlhxAWv?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltcXRGN1FsZGk4eHpKUlBYUWZ1Mm96dzNRZTdWLDk4MDI4NzQ00200UpuhUuvW/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SRXhjVmMzZk9GOWMzRElmRDBPYjdkSDB4MjdkLDEwMDA2NjA4Mg0200vxlhxAWv/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.create.1.json
index d50d57e6be..7c70b14d8f 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuoODEQaroqDjsPF9ssFmC_secret_PWylaqMQ6Nv4e8xc9jP7FfPHSXtbKdJ",
+  "client_secret": "seti_1OqSogDEQaroqDjsWPRueE0y_secret_PfoRjRaJBVP1e4wwIDjcm5fc0xrx6hh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuoODEQaroqDjsPF9ssFmC",
+  "id": "seti_1OqSogDEQaroqDjsWPRueE0y",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuoODEQaroqDjsEfjEWl1c",
+  "latest_attempt": "setatt_1OqSohDEQaroqDjsKnQZJ92C",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+  "payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.list.1.json
index 0e730a07dd..0564e8694c 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuoNDEQaroqDjsiSmSkWf9_secret_PWylQ49p6M8tJ9u4FyJRPU4SbPfICCL",
+      "client_secret": "seti_1OqSogDEQaroqDjsl2FlpMMn_secret_PfoRRsIEekmS6Afuh5UTigNMYxE1mtD",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuoNDEQaroqDjsiSmSkWf9",
+      "id": "seti_1OqSogDEQaroqDjsl2FlpMMn",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.retrieve.1.json
index d50d57e6be..7c70b14d8f 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuoODEQaroqDjsPF9ssFmC_secret_PWylaqMQ6Nv4e8xc9jP7FfPHSXtbKdJ",
+  "client_secret": "seti_1OqSogDEQaroqDjsWPRueE0y_secret_PfoRjRaJBVP1e4wwIDjcm5fc0xrx6hh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuoODEQaroqDjsPF9ssFmC",
+  "id": "seti_1OqSogDEQaroqDjsWPRueE0y",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuoODEQaroqDjsEfjEWl1c",
+  "latest_attempt": "setatt_1OqSohDEQaroqDjsKnQZJ92C",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuoODEQaroqDjsZoMw2nfK",
+  "payment_method": "pm_1OqSogDEQaroqDjsSyvJycji",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.create.1.json
index 140ed8221c..1467a216f9 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02ObgFTGvqyuiyU9TjH5gzXFsjxAVX6z49rL85mZbFL2L3YG",
+  "id": "cs_test_NORMALIZED028vKoYyV3aXLtUl37f4u6iSrgG2gaq8D5HuohmBUzRrhXm8",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "4",
+    "remote_realm_user_id": "3",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuoNDEQaroqDjsiSmSkWf9",
+  "setup_intent": "seti_1OqSogDEQaroqDjsl2FlpMMn",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02ObgFTGvqyuiyU9TjH5gzXFsjxAVX6z49rL85mZbFL2L3YG#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028vKoYyV3aXLtUl37f4u6iSrgG2gaq8D5HuohmBUzRrhXm8#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.list.1.json
index b8369c5575..351b3f7e96 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02ObgFTGvqyuiyU9TjH5gzXFsjxAVX6z49rL85mZbFL2L3YG",
+      "id": "cs_test_NORMALIZED028vKoYyV3aXLtUl37f4u6iSrgG2gaq8D5HuohmBUzRrhXm8",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "4",
+        "remote_realm_user_id": "3",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuoNDEQaroqDjsiSmSkWf9",
+      "setup_intent": "seti_1OqSogDEQaroqDjsl2FlpMMn",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02ObgFTGvqyuiyU9TjH5gzXFsjxAVX6z49rL85mZbFL2L3YG#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028vKoYyV3aXLtUl37f4u6iSrgG2gaq8D5HuohmBUzRrhXm8#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.modify.1.json
index 20833f66cd..04e46edcad 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+    "default_payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.1.json
index 54960ede6d..bc85c68abe 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+      "id": "pm_1OqSrnDEQaroqDjsq00bURYm",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.2.json
index 54960ede6d..bc85c68abe 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+      "id": "pm_1OqSrnDEQaroqDjsq00bURYm",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.3.json
index 54960ede6d..bc85c68abe 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+      "id": "pm_1OqSrnDEQaroqDjsq00bURYm",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.4.json
index 54960ede6d..bc85c68abe 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+      "id": "pm_1OqSrnDEQaroqDjsq00bURYm",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.1.json
index a0ed3eb503..7768fc5ebe 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+            "default_payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuqdDEQaroqDjstUKU2W8c",
+      "id": "evt_1OqSrpDEQaroqDjsyhzNnGpH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "fe474770-ee0d-44bc-ae8b-92b45def8966"
+        "idempotency_key": "d5ccad8e-c0a2-4a5a-be59-2cabc956f05c"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.2.json
index 4c47afbf35..f86905c3e3 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+                "payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 4300,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNLmmK4GMgZLKAV-d5c6LBaUJl4z9-T2r1jHZUcChTi2tMqmb2UnHdWGUe9Ux8ulm0PY4sO-NYaTfli4?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOOTla8GMgb_KzzQDFI6LBZQxabyF5lR5dwo9oHKdEBcBHzrPlUro-PDtrEyQ2m-bW-3k1uK3oq0IJep?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_XSE8Q8CokFcoExHSFbYnrmdDh",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_nnTfZnYpzgV5yDVmoOYu25rje",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+          "payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuqhDEQaroqDjs0chDfvec",
+      "id": "evt_3OqSrtDEQaroqDjs0PgPDEEp",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "769b0af3-4992-41bf-8b51-a65bd341b7ae"
+        "idempotency_key": "b33c7f73-843b-4b34-846b-9679b64f6c48"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+          "payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
           "payment_method_details": {
             "card": {
               "amount_authorized": 4300,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNLmmK4GMgb1wR6Uu086LBZzdg3UTaace_TNrK93b9Wb-ZEciRa1eOK2fYl6Tk8NYTq_5lu4GNzDXnxG?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOOTla8GMgaeh0nxlfo6LBZ9tiV7UO7Y4o_dVTNWIuCjAmp4H8bTISp7VSK8nrZAijF8ow1laT35skZt?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuqhDEQaroqDjs0SXGhw18",
+      "id": "evt_3OqSrtDEQaroqDjs0TfiTRue",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "769b0af3-4992-41bf-8b51-a65bd341b7ae"
+        "idempotency_key": "b33c7f73-843b-4b34-846b-9679b64f6c48"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgw0200YvDfIv6d?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3Mw0200ajgVv3sU?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgw0200YvDfIv6d/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3Mw0200ajgVv3sU/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -435,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -538,16 +540,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuqiDEQaroqDjs2oQBeISZ",
+      "id": "evt_1OqSrtDEQaroqDjsUBbOsYE3",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "508fad8a-1475-4a4c-82cb-9e69ea2e62c9"
+        "idempotency_key": "e744d3f6-e7af-4d36-a41c-aabed34a1ce1"
       },
       "type": "invoice.finalized"
     },
@@ -598,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgw0200YvDfIv6d?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3Mw0200ajgVv3sU?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgw0200YvDfIv6d/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3Mw0200ajgVv3sU/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -617,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -667,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -770,7 +774,7 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -790,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OhuqiDEQaroqDjsnzVmjpSk",
+      "id": "evt_1OqSrtDEQaroqDjspzS8e03n",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "508fad8a-1475-4a4c-82cb-9e69ea2e62c9"
+        "idempotency_key": "e744d3f6-e7af-4d36-a41c-aabed34a1ce1"
       },
       "type": "invoice.updated"
     },
@@ -824,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_XSE8Q8CokFcoExHSFbYnrmdDh",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_nnTfZnYpzgV5yDVmoOYu25rje",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -867,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuqhDEQaroqDjs07xxrZRD",
+      "id": "evt_3OqSrtDEQaroqDjs0AUrjoYo",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "508fad8a-1475-4a4c-82cb-9e69ea2e62c9"
+        "idempotency_key": "e744d3f6-e7af-4d36-a41c-aabed34a1ce1"
       },
       "type": "payment_intent.created"
     },
@@ -943,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -993,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -1096,16 +1102,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuqhDEQaroqDjsDwcFpjep",
+      "id": "evt_1OqSrsDEQaroqDjsVceHKqBG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "79567d3b-8618-4c81-9f2f-db842db27ee4"
+        "idempotency_key": "276fb42d-f008-4c07-997c-28c7f37c2195"
       },
       "type": "invoice.created"
     },
@@ -1161,13 +1167,13 @@
           "unit_amount_decimal": "-2000"
         }
       },
-      "id": "evt_1OhuqgDEQaroqDjsQDTDZ6mE",
+      "id": "evt_1OqSrsDEQaroqDjsPTQ51yqA",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "2047415c-bd39-4d03-9881-4b66e7344f87"
+        "idempotency_key": "c4391bdd-c09d-4dce-8423-d9a765647182"
       },
       "type": "invoiceitem.created"
     },
@@ -1223,13 +1229,13 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1OhuqgDEQaroqDjsPJW1BZ6P",
+      "id": "evt_1OqSrrDEQaroqDjsrjaFJJLP",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "633fd5d1-4d48-4e95-9321-9d461d220f39"
+        "idempotency_key": "1af9322f-6eed-4f91-aad3-faafe2986561"
       },
       "type": "invoiceitem.created"
     },
@@ -1252,7 +1258,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+            "default_payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
             "footer": null,
             "rendering_options": null
           },
@@ -1275,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhuqgDEQaroqDjsBk6fq4c4",
+      "id": "evt_1OqSrrDEQaroqDjsguuPYG1F",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "633fd5d1-4d48-4e95-9321-9d461d220f39"
+        "idempotency_key": "1af9322f-6eed-4f91-aad3-faafe2986561"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.3.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.3.json
index c42ced249d..5d82a88c07 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -222,15 +224,15 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuqkDEQaroqDjsnQoiE0HX",
+      "id": "evt_1OqSrvDEQaroqDjsDwcmpoRe",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "769b0af3-4992-41bf-8b51-a65bd341b7ae"
+        "idempotency_key": "b33c7f73-843b-4b34-846b-9679b64f6c48"
       },
-      "type": "invoice.paid"
+      "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -279,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +300,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +351,241 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 18,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 4300,
+          "subtotal_excluding_tax": 4300,
+          "tax": null,
+          "test_clock": null,
+          "total": 4300,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 4300,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSrvDEQaroqDjs3ykYAVh4",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "b33c7f73-843b-4b34-846b-9679b64f6c48"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 4300,
+          "amount_paid": 4300,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 6300,
+                "amount_excluding_tax": 6300,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhuqkDEQaroqDjsr8yaDfsH",
+      "id": "evt_1OqSrvDEQaroqDjsgZDVyej6",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "769b0af3-4992-41bf-8b51-a65bd341b7ae"
+        "idempotency_key": "b33c7f73-843b-4b34-846b-9679b64f6c48"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.4.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.4.json
index bc77a1298c..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 4300,
-          "amount_paid": 4300,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 6300,
-                "amount_excluding_tax": 6300,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 18,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 4300,
-          "subtotal_excluding_tax": 4300,
-          "tax": null,
-          "test_clock": null,
-          "total": 4300,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 4300,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhuqkDEQaroqDjsYF6sut0a",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "769b0af3-4992-41bf-8b51-a65bd341b7ae"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.5.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.1.json
index 2ee818ce55..f2ec80f992 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.2.json
index 54c62ccd21..78fece6591 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -160,6 +162,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -258,5 +261,5 @@
   "total_excluding_tax": 7685,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.1.json
index 3001cc68dc..f5b1693178 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgw0200YvDfIv6d?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3Mw0200ajgVv3sU?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgw0200YvDfIv6d/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3Mw0200ajgVv3sU/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.2.json
index 6e4017edc2..a84d7e4250 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvemJBakFlTmhYTUJ1MXBIVzRTOEx2ajdUQTBCLDk4MDI4ODg20200mPuarwYX?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VVWZsUEF1MjdzQWVaUERyT3M2dkpDYmRIOHRPLDEwMDA2NjI3OQ02002dXBhEC5?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvemJBakFlTmhYTUJ1MXBIVzRTOEx2ajdUQTBCLDk4MDI4ODg20200mPuarwYX/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VVWZsUEF1MjdzQWVaUERyT3M2dkpDYmRIOHRPLDEwMDA2NjI3OQ02002dXBhEC5/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -160,6 +162,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -258,5 +261,5 @@
   "total_excluding_tax": 7685,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.list.2.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.list.2.json
index ea2366f8cd..5fe4f4c05a 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvemJBakFlTmhYTUJ1MXBIVzRTOEx2ajdUQTBCLDk4MDI4ODg30200DRnhLAXH?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VVWZsUEF1MjdzQWVaUERyT3M2dkpDYmRIOHRPLDEwMDA2NjI4MA0200pF72tCbZ?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvemJBakFlTmhYTUJ1MXBIVzRTOEx2ajdUQTBCLDk4MDI4ODg30200DRnhLAXH/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VVWZsUEF1MjdzQWVaUERyT3M2dkpDYmRIOHRPLDEwMDA2NjI4MA0200pF72tCbZ/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -162,6 +164,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000005",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000005",
             "livemode": false,
             "metadata": {},
@@ -260,7 +263,7 @@
       "total_excluding_tax": 7685,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -305,9 +308,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODg302000TJkODMH?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI4MA02006MCRNnMF?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODg302000TJkODMH/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI4MA02006MCRNnMF/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -324,6 +327,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -374,6 +378,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.pay.1.json
index 3479f00b0e..bba952f021 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvTjM0RE5FTGlsZ0diNHFiT2pLUm1LdThoVEVoLDk4MDI4ODgy0200oai7vTOh/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VMUNEeUZqTUhKSU9rSHpuR25FZlN6RVFHb3NGLDEwMDA2NjI3NQ0200nWAkprbM/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.create.1.json
index ac773de1ac..d4c9bcf9a7 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuqcDEQaroqDjsZUpnFO2R_secret_PWyo4EQvjrzMLAaoCsH9w88SeDm6FDL",
+  "client_secret": "seti_1OqSrnDEQaroqDjslmbsn8yV_secret_PfoUWGTWsS7eEWi19cplVmZL8m3Bk6U",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuqcDEQaroqDjsZUpnFO2R",
+  "id": "seti_1OqSrnDEQaroqDjslmbsn8yV",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuqcDEQaroqDjsnBYMGvOg",
+  "latest_attempt": "setatt_1OqSrnDEQaroqDjsRpymgtTG",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+  "payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.list.1.json
index 308c3853ca..7c8678c7ea 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuqbDEQaroqDjs4Kf2mKdM_secret_PWyoKYyK6Ljgk8yHk5Ahtuwr1oMXAmh",
+      "client_secret": "seti_1OqSrnDEQaroqDjs1ljVUT1i_secret_PfoUzT1CJhvTl5HQUPWBIrv8sZYuuUb",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuqbDEQaroqDjs4Kf2mKdM",
+      "id": "seti_1OqSrnDEQaroqDjs1ljVUT1i",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.retrieve.1.json
index ac773de1ac..d4c9bcf9a7 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuqcDEQaroqDjsZUpnFO2R_secret_PWyo4EQvjrzMLAaoCsH9w88SeDm6FDL",
+  "client_secret": "seti_1OqSrnDEQaroqDjslmbsn8yV_secret_PfoUWGTWsS7eEWi19cplVmZL8m3Bk6U",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuqcDEQaroqDjsZUpnFO2R",
+  "id": "seti_1OqSrnDEQaroqDjslmbsn8yV",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuqcDEQaroqDjsnBYMGvOg",
+  "latest_attempt": "setatt_1OqSrnDEQaroqDjsRpymgtTG",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuqbDEQaroqDjscXWjEkSB",
+  "payment_method": "pm_1OqSrnDEQaroqDjsq00bURYm",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.create.1.json
index a80ed13105..af4d4e9b55 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02uhiGGojJpSnvgnSTLSTCE4w6HBUsL79jrDY03tyUMJQywu",
+  "id": "cs_test_NORMALIZED02r2mIvq6JUfL6q7p32Gk6rENHOjeU4iuQD5cmUkBKHqhxDz",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "5",
+    "remote_server_user_id": "6",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuqbDEQaroqDjs4Kf2mKdM",
+  "setup_intent": "seti_1OqSrnDEQaroqDjs1ljVUT1i",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02uhiGGojJpSnvgnSTLSTCE4w6HBUsL79jrDY03tyUMJQywu#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02r2mIvq6JUfL6q7p32Gk6rENHOjeU4iuQD5cmUkBKHqhxDz#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.list.1.json
index a017bfe760..987b72f2f3 100644
--- a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02uhiGGojJpSnvgnSTLSTCE4w6HBUsL79jrDY03tyUMJQywu",
+      "id": "cs_test_NORMALIZED02r2mIvq6JUfL6q7p32Gk6rENHOjeU4iuQD5cmUkBKHqhxDz",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "5",
+        "remote_server_user_id": "6",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuqbDEQaroqDjs4Kf2mKdM",
+      "setup_intent": "seti_1OqSrnDEQaroqDjs1ljVUT1i",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02uhiGGojJpSnvgnSTLSTCE4w6HBUsL79jrDY03tyUMJQywu#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02r2mIvq6JUfL6q7p32Gk6rENHOjeU4iuQD5cmUkBKHqhxDz#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.modify.1.json
index 531a20bda2..39c3a08cd1 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuoeDEQaroqDjsqeebLZQO",
+    "default_payment_method": "pm_1OqSowDEQaroqDjsPxPF1McI",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.1.json
index 723e1470fe..8a206941de 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoeDEQaroqDjsqeebLZQO",
+      "id": "pm_1OqSowDEQaroqDjsPxPF1McI",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.2.json
index 723e1470fe..8a206941de 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoeDEQaroqDjsqeebLZQO",
+      "id": "pm_1OqSowDEQaroqDjsPxPF1McI",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.3.json
index 723e1470fe..8a206941de 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoeDEQaroqDjsqeebLZQO",
+      "id": "pm_1OqSowDEQaroqDjsPxPF1McI",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.4.json
index 723e1470fe..8a206941de 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuoeDEQaroqDjsqeebLZQO",
+      "id": "pm_1OqSowDEQaroqDjsPxPF1McI",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.create.1.json
index 274d210913..766b778984 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.finalize_invoice.1.json
index 0449240fe7..d03445df7b 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lteEcxcUNoekJ3ZjEzMjlXS01FR0RnTHgyR2pOLDk4MDI4NzU40200FJthrnwr?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SbTFGQnhMQWh6QmR3OEN2eUhqZ1RZRlZYQ1BlLDEwMDA2NjA5Ng0200BBwciYzs?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lteEcxcUNoekJ3ZjEzMjlXS01FR0RnTHgyR2pOLDk4MDI4NzU40200FJthrnwr/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SbTFGQnhMQWh6QmR3OEN2eUhqZ1RZRlZYQ1BlLDEwMDA2NjA5Ng0200BBwciYzs/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.list.2.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.list.2.json
index 91617c7a92..0c7435f483 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lteEcxcUNoekJ3ZjEzMjlXS01FR0RnTHgyR2pOLDk4MDI4NzU40200FJthrnwr?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SbTFGQnhMQWh6QmR3OEN2eUhqZ1RZRlZYQ1BlLDEwMDA2NjA5Ng0200BBwciYzs?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lteEcxcUNoekJ3ZjEzMjlXS01FR0RnTHgyR2pOLDk4MDI4NzU40200FJthrnwr/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SbTFGQnhMQWh6QmR3OEN2eUhqZ1RZRlZYQ1BlLDEwMDA2NjA5Ng0200BBwciYzs/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -210,7 +212,7 @@
       "total_excluding_tax": 176000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.create.1.json
index 4fde273e0c..9cb65583df 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuoeDEQaroqDjsfwtyYHTh_secret_PWymgUECgOOfZQomimhpgxyqtZoUYlD",
+  "client_secret": "seti_1OqSowDEQaroqDjsKit3WqcX_secret_PfoRwVJv0TI4l2di2tO7hllaBSkwkb0",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuoeDEQaroqDjsfwtyYHTh",
+  "id": "seti_1OqSowDEQaroqDjsKit3WqcX",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuoeDEQaroqDjsvaNQVB2m",
+  "latest_attempt": "setatt_1OqSowDEQaroqDjsyC1dxaKr",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuoeDEQaroqDjsqeebLZQO",
+  "payment_method": "pm_1OqSowDEQaroqDjsPxPF1McI",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.list.1.json
index 9b86c74d3b..c850acc02f 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuodDEQaroqDjsPduuIl4X_secret_PWymaeAU7FebhO0iP97blFbEeJhMFM3",
+      "client_secret": "seti_1OqSovDEQaroqDjstKL2DHxj_secret_PfoR3t4l0N7xvkg7csuiqtDFo5cBygL",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuodDEQaroqDjsPduuIl4X",
+      "id": "seti_1OqSovDEQaroqDjstKL2DHxj",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.retrieve.1.json
index 4fde273e0c..9cb65583df 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuoeDEQaroqDjsfwtyYHTh_secret_PWymgUECgOOfZQomimhpgxyqtZoUYlD",
+  "client_secret": "seti_1OqSowDEQaroqDjsKit3WqcX_secret_PfoRwVJv0TI4l2di2tO7hllaBSkwkb0",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuoeDEQaroqDjsfwtyYHTh",
+  "id": "seti_1OqSowDEQaroqDjsKit3WqcX",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuoeDEQaroqDjsvaNQVB2m",
+  "latest_attempt": "setatt_1OqSowDEQaroqDjsyC1dxaKr",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuoeDEQaroqDjsqeebLZQO",
+  "payment_method": "pm_1OqSowDEQaroqDjsPxPF1McI",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.create.1.json
index e7eb852eb4..6712609bcb 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02sBbt08VvTQBh5mYxzSae0hkRcNsQvbEXWaHtjWx9iBm4Ul",
+  "id": "cs_test_NORMALIZED022KnIGz5EWP2VElIilSJwmk2Cnkk0zsDZUKGGcG5ZA33WEn",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "5",
+    "remote_realm_user_id": "4",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuodDEQaroqDjsPduuIl4X",
+  "setup_intent": "seti_1OqSovDEQaroqDjstKL2DHxj",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02sBbt08VvTQBh5mYxzSae0hkRcNsQvbEXWaHtjWx9iBm4Ul#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED022KnIGz5EWP2VElIilSJwmk2Cnkk0zsDZUKGGcG5ZA33WEn#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.list.1.json
index 9109248d42..b2f97ac217 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02sBbt08VvTQBh5mYxzSae0hkRcNsQvbEXWaHtjWx9iBm4Ul",
+      "id": "cs_test_NORMALIZED022KnIGz5EWP2VElIilSJwmk2Cnkk0zsDZUKGGcG5ZA33WEn",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "5",
+        "remote_realm_user_id": "4",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuodDEQaroqDjsPduuIl4X",
+      "setup_intent": "seti_1OqSovDEQaroqDjstKL2DHxj",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02sBbt08VvTQBh5mYxzSae0hkRcNsQvbEXWaHtjWx9iBm4Ul#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED022KnIGz5EWP2VElIilSJwmk2Cnkk0zsDZUKGGcG5ZA33WEn#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.modify.1.json
index c0383ee3d9..ee637b9c90 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuqrDEQaroqDjsuAMhZ3LL",
+    "default_payment_method": "pm_1OqSs3DEQaroqDjsm8C8VpLd",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.1.json
index 5b2a67f4ed..16edaebd37 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqrDEQaroqDjsuAMhZ3LL",
+      "id": "pm_1OqSs3DEQaroqDjsm8C8VpLd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.2.json
index 5b2a67f4ed..16edaebd37 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqrDEQaroqDjsuAMhZ3LL",
+      "id": "pm_1OqSs3DEQaroqDjsm8C8VpLd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.3.json
index 5b2a67f4ed..16edaebd37 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqrDEQaroqDjsuAMhZ3LL",
+      "id": "pm_1OqSs3DEQaroqDjsm8C8VpLd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.4.json
index 5b2a67f4ed..16edaebd37 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuqrDEQaroqDjsuAMhZ3LL",
+      "id": "pm_1OqSs3DEQaroqDjsm8C8VpLd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.create.1.json
index 274d210913..766b778984 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.finalize_invoice.1.json
index a08cc3132c..4677159ddd 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvczI1U3l4T3JYQ2xlVm5TMzViT1VHalhlS1V5LDk4MDI4ODk10200aebqVnUh?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdW1EWkNOVjNMRUk3NnFsQUkxbDdLalNXOE5NLDEwMDA2NjI4OA0200PaC4ygKo?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvczI1U3l4T3JYQ2xlVm5TMzViT1VHalhlS1V5LDk4MDI4ODk10200aebqVnUh/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdW1EWkNOVjNMRUk3NnFsQUkxbDdLalNXOE5NLDEwMDA2NjI4OA0200PaC4ygKo/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.list.2.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.list.2.json
index 5ea0ab0598..e4520778e5 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvczI1U3l4T3JYQ2xlVm5TMzViT1VHalhlS1V5LDk4MDI4ODk10200aebqVnUh?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdW1EWkNOVjNMRUk3NnFsQUkxbDdLalNXOE5NLDEwMDA2NjI4OQ0200eT6VJjVV?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvczI1U3l4T3JYQ2xlVm5TMzViT1VHalhlS1V5LDk4MDI4ODk10200aebqVnUh/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdW1EWkNOVjNMRUk3NnFsQUkxbDdLalNXOE5NLDEwMDA2NjI4OQ0200eT6VJjVV/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -210,7 +212,7 @@
       "total_excluding_tax": 176000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.create.1.json
index c37673fb0a..872dd08d84 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuqrDEQaroqDjsancgn21K_secret_PWyoTFCVJ6yvpDvue2kTuDQ1gZ5NDD6",
+  "client_secret": "seti_1OqSs3DEQaroqDjsbXE69xWl_secret_PfoV9SzJThf233aoK2ma0sbyWfThnI6",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuqrDEQaroqDjsancgn21K",
+  "id": "seti_1OqSs3DEQaroqDjsbXE69xWl",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuqrDEQaroqDjsUNyl6nQk",
+  "latest_attempt": "setatt_1OqSs3DEQaroqDjswVS6yG6O",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuqrDEQaroqDjsuAMhZ3LL",
+  "payment_method": "pm_1OqSs3DEQaroqDjsm8C8VpLd",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.list.1.json
index ee38213cde..b4740512df 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuqrDEQaroqDjsNo3GKuO7_secret_PWyo4KhzCuDrCXSRcIVXBrO2cihqh6a",
+      "client_secret": "seti_1OqSs2DEQaroqDjsgtZjpgjp_secret_PfoV4HEUIL2IpKEFddyXNJggWpGbwo8",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuqrDEQaroqDjsNo3GKuO7",
+      "id": "seti_1OqSs2DEQaroqDjsgtZjpgjp",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.retrieve.1.json
index c37673fb0a..872dd08d84 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuqrDEQaroqDjsancgn21K_secret_PWyoTFCVJ6yvpDvue2kTuDQ1gZ5NDD6",
+  "client_secret": "seti_1OqSs3DEQaroqDjsbXE69xWl_secret_PfoV9SzJThf233aoK2ma0sbyWfThnI6",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuqrDEQaroqDjsancgn21K",
+  "id": "seti_1OqSs3DEQaroqDjsbXE69xWl",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuqrDEQaroqDjsUNyl6nQk",
+  "latest_attempt": "setatt_1OqSs3DEQaroqDjswVS6yG6O",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuqrDEQaroqDjsuAMhZ3LL",
+  "payment_method": "pm_1OqSs3DEQaroqDjsm8C8VpLd",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.create.1.json
index 7a595dcfd4..5de47c5a67 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02waTwb1c8zL6hQdUCxIk0tkOefxQYzt8b39omWP9VSj3gyp",
+  "id": "cs_test_NORMALIZED023m7UUOezisdZ9wO60WsMF9iWaxfEhRICZDD6NBc1FD55Vs",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "6",
+    "remote_server_user_id": "7",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuqrDEQaroqDjsNo3GKuO7",
+  "setup_intent": "seti_1OqSs2DEQaroqDjsgtZjpgjp",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02waTwb1c8zL6hQdUCxIk0tkOefxQYzt8b39omWP9VSj3gyp#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED023m7UUOezisdZ9wO60WsMF9iWaxfEhRICZDD6NBc1FD55Vs#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.list.1.json
index a56453b693..f6b2cb2dce 100644
--- a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02waTwb1c8zL6hQdUCxIk0tkOefxQYzt8b39omWP9VSj3gyp",
+      "id": "cs_test_NORMALIZED023m7UUOezisdZ9wO60WsMF9iWaxfEhRICZDD6NBc1FD55Vs",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "6",
+        "remote_server_user_id": "7",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuqrDEQaroqDjsNo3GKuO7",
+      "setup_intent": "seti_1OqSs2DEQaroqDjsgtZjpgjp",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02waTwb1c8zL6hQdUCxIk0tkOefxQYzt8b39omWP9VSj3gyp#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED023m7UUOezisdZ9wO60WsMF9iWaxfEhRICZDD6NBc1FD55Vs#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.create.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.modify.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.modify.1.json
index 0e5470f1aa..3ca19b5ec9 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+    "default_payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.1.json
index 21ce37104a..849e13f3aa 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+      "id": "pm_1OqSp5DEQaroqDjsPB3UW83V",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.2.json
index 21ce37104a..849e13f3aa 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+      "id": "pm_1OqSp5DEQaroqDjsPB3UW83V",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.3.json
index 21ce37104a..849e13f3aa 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+      "id": "pm_1OqSp5DEQaroqDjsPB3UW83V",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.4.json
index 21ce37104a..849e13f3aa 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+      "id": "pm_1OqSp5DEQaroqDjsPB3UW83V",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.5.json
index bd05ec0007..297798b53c 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.5.json
@@ -6,7 +6,7 @@
   "default_currency": "usd",
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+      "id": "pm_1OqSp5DEQaroqDjsPB3UW83V",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 2,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.1.json
index 2987bbfb75..1fab9941f0 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+            "default_payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuopDEQaroqDjs1s8nL6K8",
+      "id": "evt_1OqSp7DEQaroqDjsLPJzx3QJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "3e72f558-2e9b-49b2-9fe5-9110d112f7f4"
+        "idempotency_key": "47801d66-901c-4c4e-bf8d-24465a6c8c52"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.2.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.2.json
index a45b033790..ad55f8d753 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+                "payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 176000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOHlmK4GMgavXv2ddpw6LBb2JENIS_8X-DoLJ8nPhoTcHgfXUP20ScTaekgcTV7brPhj3e4jqgvHDMP5?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLqSla8GMgaP0Uq_Qeo6LBa1-p2L3D7JubSlz-iA6PHE5ejZoLT1DRmi4UgdjTehMQlE9ypg8nn2W9SE?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_7EQ1v9G4TGYa69nMrTADXWB5k",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_yIHaFWFUwla0rxTkZPWBNzTth",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+          "payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuosDEQaroqDjs1fyv1QXg",
+      "id": "evt_3OqSpADEQaroqDjs0U3v20Od",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff8f575f-b8f2-41ad-943d-1c1ef4f50677"
+        "idempotency_key": "0e8b89df-0a37-40e1-beac-c8d0dfd08a09"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 176000,
+          "amount_captured": 176000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BUSINESS",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 176000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 176000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLuSla8GMgaOQusSEaY6LBYJdWNgF0b7cMs9mD_AEP_fkwAnKdFG3gSExKSd2LIfJoeUPBGPYoXl8jFR?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Business",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSpADEQaroqDjs0VgyXIpV",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "0e8b89df-0a37-40e1-beac-c8d0dfd08a09"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY30200EGMIxnSc?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNQ0200cde1u1kN?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY30200EGMIxnSc/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNQ0200cde1u1kN/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -307,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -410,16 +540,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuotDEQaroqDjsB763CvJh",
+      "id": "evt_1OqSpBDEQaroqDjs8DAAq5rH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "c2b2a193-315d-426a-b86f-fc72a2c5ea96"
+        "idempotency_key": "ede5c341-4d8e-4322-9870-d96d0c2e13fa"
       },
       "type": "invoice.finalized"
     },
@@ -470,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY30200EGMIxnSc?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNQ0200cde1u1kN?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY30200EGMIxnSc/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNQ0200cde1u1kN/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -489,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -539,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -642,7 +774,7 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -662,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OhuotDEQaroqDjsBn5uu3Ge",
+      "id": "evt_1OqSpBDEQaroqDjsgtMsIHqQ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "c2b2a193-315d-426a-b86f-fc72a2c5ea96"
+        "idempotency_key": "ede5c341-4d8e-4322-9870-d96d0c2e13fa"
       },
       "type": "invoice.updated"
     },
@@ -696,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_7EQ1v9G4TGYa69nMrTADXWB5k",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_yIHaFWFUwla0rxTkZPWBNzTth",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -739,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuosDEQaroqDjs1JofAX4X",
+      "id": "evt_3OqSpADEQaroqDjs0eJj7Rmk",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "c2b2a193-315d-426a-b86f-fc72a2c5ea96"
+        "idempotency_key": "ede5c341-4d8e-4322-9870-d96d0c2e13fa"
       },
       "type": "payment_intent.created"
     },
@@ -815,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -865,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -968,16 +1102,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuosDEQaroqDjsKPPDsaul",
+      "id": "evt_1OqSpADEQaroqDjsbfVrAsMP",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "342a98aa-c279-4b34-be78-518c9bc107d5"
+        "idempotency_key": "c43b3a5e-55cd-4a6c-8cde-b397a5714ebe"
       },
       "type": "invoice.created"
     },
@@ -1033,13 +1167,13 @@
           "unit_amount_decimal": "-24000"
         }
       },
-      "id": "evt_1OhuorDEQaroqDjsEDYPhHWB",
+      "id": "evt_1OqSp9DEQaroqDjsX7zNVGMg",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "4dd40d47-9603-4013-a378-f954a5c7cfbe"
+        "idempotency_key": "1a17c72b-54b2-427b-a9fd-2769f4e6c2b3"
       },
       "type": "invoiceitem.created"
     },
@@ -1095,13 +1229,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhuorDEQaroqDjsYSfNth8D",
+      "id": "evt_1OqSp9DEQaroqDjsYeD1WwkD",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "e5a459d4-06e6-4f44-b478-19aff80f375e"
+        "idempotency_key": "bd57f902-a867-4915-be73-534814d25035"
       },
       "type": "invoiceitem.created"
     },
@@ -1117,21 +1251,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+            "default_payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1147,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhuorDEQaroqDjsq59DKKNN",
+      "id": "evt_1OqSp9DEQaroqDjsYYzVpSIW",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "e5a459d4-06e6-4f44-b478-19aff80f375e"
+        "idempotency_key": "bd57f902-a867-4915-be73-534814d25035"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.3.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.3.json
index ff45aab5ce..00c86e46a3 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY50200GCtWx2Vq?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNw0200CrSPFyZJ?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY50200GCtWx2Vq/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNw0200CrSPFyZJ/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -219,7 +221,475 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSpDDEQaroqDjsJ8GwbQBq",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "0e8b89df-0a37-40e1-beac-c8d0dfd08a09"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 176000,
+          "amount_paid": 176000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNw0200CrSPFyZJ?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNw0200CrSPFyZJ/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -24000,
+                "amount_excluding_tax": -24000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -24000,
+                  "unit_amount_decimal": "-24000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-24000"
+              },
+              {
+                "amount": 200000,
+                "amount_excluding_tax": 200000,
+                "currency": "usd",
+                "description": "Zulip Business",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 25,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "25",
+            "plan_tier": "104"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Business",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 176000,
+          "subtotal_excluding_tax": 176000,
+          "tax": null,
+          "test_clock": null,
+          "total": 176000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 176000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSpDDEQaroqDjsL8BQHC3y",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "0e8b89df-0a37-40e1-beac-c8d0dfd08a09"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 176000,
+          "amount_paid": 176000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNw0200CrSPFyZJ?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNw0200CrSPFyZJ/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -24000,
+                "amount_excluding_tax": -24000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -24000,
+                  "unit_amount_decimal": "-24000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-24000"
+              },
+              {
+                "amount": 200000,
+                "amount_excluding_tax": 200000,
+                "currency": "usd",
+                "description": "Zulip Business",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 25,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "25",
+            "plan_tier": "104"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Business",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 176000,
+          "subtotal_excluding_tax": 176000,
+          "tax": null,
+          "test_clock": null,
+          "total": 176000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 176000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -234,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhuovDEQaroqDjsueiwLjiw",
+      "id": "evt_1OqSpDDEQaroqDjsS6x6A7Br",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff8f575f-b8f2-41ad-943d-1c1ef4f50677"
+        "idempotency_key": "0e8b89df-0a37-40e1-beac-c8d0dfd08a09"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.4.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.4.json
index 0f93576120..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.4.json
@@ -1,470 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 176000,
-          "amount_paid": 176000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4Nzcw02008iTV99pV?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4Nzcw02008iTV99pV/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -24000,
-                "amount_excluding_tax": -24000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -24000,
-                  "unit_amount_decimal": "-24000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-24000"
-              },
-              {
-                "amount": 200000,
-                "amount_excluding_tax": 200000,
-                "currency": "usd",
-                "description": "Zulip Business",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 25,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "25",
-            "plan_tier": "104"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Business",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 176000,
-          "subtotal_excluding_tax": 176000,
-          "tax": null,
-          "test_clock": null,
-          "total": 176000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 176000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhuowDEQaroqDjsIPrK1bIU",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 2,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff8f575f-b8f2-41ad-943d-1c1ef4f50677"
-      },
-      "type": "invoice.payment_succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 176000,
-          "amount_paid": 176000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4Nzcw02008iTV99pV?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4Nzcw02008iTV99pV/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -24000,
-                "amount_excluding_tax": -24000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -24000,
-                  "unit_amount_decimal": "-24000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-24000"
-              },
-              {
-                "amount": 200000,
-                "amount_excluding_tax": 200000,
-                "currency": "usd",
-                "description": "Zulip Business",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 25,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "25",
-            "plan_tier": "104"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Business",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 176000,
-          "subtotal_excluding_tax": 176000,
-          "tax": null,
-          "test_clock": null,
-          "total": 176000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 176000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhuowDEQaroqDjsNimNrlrG",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff8f575f-b8f2-41ad-943d-1c1ef4f50677"
-      },
-      "type": "invoice.paid"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.5.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.create.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.create.1.json
index 8f204802be..871a278cdc 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.finalize_invoice.1.json
index c1d2b488d8..83ce12ca29 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY30200EGMIxnSc?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNQ0200cde1u1kN?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY30200EGMIxnSc/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNQ0200cde1u1kN/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.pay.1.json
index 42ee92bbc8..1db6b289df 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY50200GCtWx2Vq?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNg0200bh3deuWI?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltTk14ZElyaXpTU1hVUUpzNmhsRmFKN2NUcEhuLDk4MDI4NzY50200GCtWx2Vq/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td0RuRkNqVnFkVXNNRlZuU1NuY1NnMnVzdFRDLDEwMDA2NjEwNg0200bh3deuWI/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.create.1.json
index 4f95aa7807..69f657e16b 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuonDEQaroqDjsI78f7fTq_secret_PWymlnDcAIJVlPmR1cIcnwEz0RtX4Rn",
+  "client_secret": "seti_1OqSp5DEQaroqDjshgMoEJqT_secret_PfoRQ0Y4nQNh7PWw85M25TTzSvTFLHo",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuonDEQaroqDjsI78f7fTq",
+  "id": "seti_1OqSp5DEQaroqDjshgMoEJqT",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuonDEQaroqDjsNXiWJkCI",
+  "latest_attempt": "setatt_1OqSp5DEQaroqDjsYEn8ri5f",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+  "payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.list.1.json
index 910579618b..12d948b833 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuomDEQaroqDjsMjDVxo1v_secret_PWymPy1Xeuooq6hA259UT2RwICJoDVk",
+      "client_secret": "seti_1OqSp4DEQaroqDjsgYXqeElP_secret_PfoRr4ig0SwkT89xuGg8DZhoqBuA5UL",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuomDEQaroqDjsMjDVxo1v",
+      "id": "seti_1OqSp4DEQaroqDjsgYXqeElP",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.retrieve.1.json
index 4f95aa7807..69f657e16b 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuonDEQaroqDjsI78f7fTq_secret_PWymlnDcAIJVlPmR1cIcnwEz0RtX4Rn",
+  "client_secret": "seti_1OqSp5DEQaroqDjshgMoEJqT_secret_PfoRQ0Y4nQNh7PWw85M25TTzSvTFLHo",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuonDEQaroqDjsI78f7fTq",
+  "id": "seti_1OqSp5DEQaroqDjshgMoEJqT",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuonDEQaroqDjsNXiWJkCI",
+  "latest_attempt": "setatt_1OqSp5DEQaroqDjsYEn8ri5f",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuonDEQaroqDjsdbOWRnZu",
+  "payment_method": "pm_1OqSp5DEQaroqDjsPB3UW83V",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.create.1.json
index ab73ba1136..be5564ad37 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02Hu6hWgaHlHOTdVorOpdGPfKjNeH05FRaGlmX8sGaPPwQdM",
+  "id": "cs_test_NORMALIZED02NGluuUFndi2bWKL01w0gjeFRcTwLVnbIclz7hafsxqdjpo",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "6",
+    "remote_realm_user_id": "5",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuomDEQaroqDjsMjDVxo1v",
+  "setup_intent": "seti_1OqSp4DEQaroqDjsgYXqeElP",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Hu6hWgaHlHOTdVorOpdGPfKjNeH05FRaGlmX8sGaPPwQdM#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02NGluuUFndi2bWKL01w0gjeFRcTwLVnbIclz7hafsxqdjpo#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.list.1.json
index 370630390c..634b745161 100644
--- a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02Hu6hWgaHlHOTdVorOpdGPfKjNeH05FRaGlmX8sGaPPwQdM",
+      "id": "cs_test_NORMALIZED02NGluuUFndi2bWKL01w0gjeFRcTwLVnbIclz7hafsxqdjpo",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "6",
+        "remote_realm_user_id": "5",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuomDEQaroqDjsMjDVxo1v",
+      "setup_intent": "seti_1OqSp4DEQaroqDjsgYXqeElP",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Hu6hWgaHlHOTdVorOpdGPfKjNeH05FRaGlmX8sGaPPwQdM#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02NGluuUFndi2bWKL01w0gjeFRcTwLVnbIclz7hafsxqdjpo#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.modify.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.modify.1.json
index e7ddbee88f..cd730c84af 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+    "default_payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.1.json
index fdbbbef0ce..72a8ca06fb 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+      "id": "pm_1OqSsDDEQaroqDjssRFPEqYa",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.2.json
index fdbbbef0ce..72a8ca06fb 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+      "id": "pm_1OqSsDDEQaroqDjssRFPEqYa",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.3.json
index fdbbbef0ce..72a8ca06fb 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+      "id": "pm_1OqSsDDEQaroqDjssRFPEqYa",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.4.json
index fdbbbef0ce..72a8ca06fb 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+      "id": "pm_1OqSsDDEQaroqDjssRFPEqYa",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.5.json
index 7de6dd22a8..8ecfc75cdc 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+      "id": "pm_1OqSsDDEQaroqDjssRFPEqYa",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.1.json
index a60fe821b4..4220e734aa 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+            "default_payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1Ohur3DEQaroqDjsZ3n8VB4p",
+      "id": "evt_1OqSsFDEQaroqDjsR5s89Lm5",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "b3ff9cb6-cb64-4cc6-ad8f-457221173293"
+        "idempotency_key": "d08aef1f-64fb-45e4-b2d2-9f68f0834688"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.2.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.2.json
index 105ebc6432..f7d20118e4 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+                "payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 176000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOzmmK4GMgZN0vjj8p06LBZ32nsY5DC_Zq-JObp5miRtgODMyw6PNuE16x5esLXHUBtS3HW08IHWI2QM?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKPyTla8GMgY2j4fJQec6LBZyPLrZzl-pMlCswtR4lsVcJRBRA4qRNkWy886Qs8ryvukB7lWUDep-VS9J?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_auU48az6Op2vqJHqhHIpN6fHK",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_v2XRc9Z8FKC1zCFp4AVcX1ZJE",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+          "payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohur7DEQaroqDjs0vL5IVhg",
+      "id": "evt_3OqSsJDEQaroqDjs0W2PqkIm",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "442aed18-c0f3-432d-9d7c-2df58e804cf0"
+        "idempotency_key": "ce7dedd8-988e-48fe-8609-44f9259a6540"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 176000,
+          "amount_captured": 176000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BUSINESS",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 176000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 176000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKP2Tla8GMgZbV8ePopY6LBb0eX6auDHnQBpLjR5rWGOPyKSQX-lB-7MyJ0Bbmd-vJ11DAlPfSNLy5iS0?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Business",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSsJDEQaroqDjs00MPGp40",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "ce7dedd8-988e-48fe-8609-44f9259a6540"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA20200EQAmJOnJ?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjI5OQ0200RtuRFboI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA20200EQAmJOnJ/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjI5OQ0200RtuRFboI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -307,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -410,16 +540,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohur8DEQaroqDjsbaP0ufXB",
+      "id": "evt_1OqSsJDEQaroqDjsH9TOdFsG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "40332fe7-aa48-45ce-880a-8be9b9375f3c"
+        "idempotency_key": "23868fcf-7fa1-46ea-9b38-76a3f99e4882"
       },
       "type": "invoice.finalized"
     },
@@ -470,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA20200EQAmJOnJ?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjI5OQ0200RtuRFboI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA20200EQAmJOnJ/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjI5OQ0200RtuRFboI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -489,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -539,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -642,7 +774,7 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -662,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1Ohur8DEQaroqDjscVRkFogf",
+      "id": "evt_1OqSsJDEQaroqDjs7SPuXCD0",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "40332fe7-aa48-45ce-880a-8be9b9375f3c"
+        "idempotency_key": "23868fcf-7fa1-46ea-9b38-76a3f99e4882"
       },
       "type": "invoice.updated"
     },
@@ -696,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_auU48az6Op2vqJHqhHIpN6fHK",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_v2XRc9Z8FKC1zCFp4AVcX1ZJE",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -739,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohur7DEQaroqDjs0WA8VA3o",
+      "id": "evt_3OqSsJDEQaroqDjs0y1Ac5Xw",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "40332fe7-aa48-45ce-880a-8be9b9375f3c"
+        "idempotency_key": "23868fcf-7fa1-46ea-9b38-76a3f99e4882"
       },
       "type": "payment_intent.created"
     },
@@ -815,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -865,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -968,16 +1102,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohur7DEQaroqDjshhGMR95F",
+      "id": "evt_1OqSsIDEQaroqDjsF3Xt9lGf",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "e5db6238-2f40-4c51-a516-008414f29bdd"
+        "idempotency_key": "c41e3fff-531b-4999-b974-7ef98fd202ec"
       },
       "type": "invoice.created"
     },
@@ -1033,13 +1167,13 @@
           "unit_amount_decimal": "-24000"
         }
       },
-      "id": "evt_1Ohur6DEQaroqDjs6GZh5lDH",
+      "id": "evt_1OqSsIDEQaroqDjshnbkeps9",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "89fe5eea-f641-4c2c-910c-c691bfcfd2c6"
+        "idempotency_key": "d7082830-04bd-4762-be1a-1ba138996cfc"
       },
       "type": "invoiceitem.created"
     },
@@ -1095,13 +1229,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1Ohur6DEQaroqDjsFmZUBb33",
+      "id": "evt_1OqSsHDEQaroqDjs3OBCxxGe",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "d8edd49e-b848-4c8c-9cc8-bb35d1b13f8e"
+        "idempotency_key": "d632ca84-0876-46ac-ad21-dfdca5b34204"
       },
       "type": "invoiceitem.created"
     },
@@ -1124,7 +1258,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+            "default_payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
             "footer": null,
             "rendering_options": null
           },
@@ -1147,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1Ohur6DEQaroqDjsUmBpOtvE",
+      "id": "evt_1OqSsHDEQaroqDjs4JBv4m6y",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "d8edd49e-b848-4c8c-9cc8-bb35d1b13f8e"
+        "idempotency_key": "d632ca84-0876-46ac-ad21-dfdca5b34204"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.3.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.3.json
index 1a93c5b799..1123a36e44 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA40200vXGxngw3?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMQ0200gfojU4ds?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA40200vXGxngw3/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMQ0200gfojU4ds/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -222,15 +224,15 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhurADEQaroqDjshgQd5Qjy",
+      "id": "evt_1OqSsLDEQaroqDjsehPHMV3P",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "442aed18-c0f3-432d-9d7c-2df58e804cf0"
+        "idempotency_key": "ce7dedd8-988e-48fe-8609-44f9259a6540"
       },
-      "type": "invoice.paid"
+      "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -279,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA40200vXGxngw3?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMQ0200gfojU4ds?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA40200vXGxngw3/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMQ0200gfojU4ds/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +300,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +351,241 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 25,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "25",
+            "plan_tier": "104"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Business",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 176000,
+          "subtotal_excluding_tax": 176000,
+          "tax": null,
+          "test_clock": null,
+          "total": 176000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 176000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSsLDEQaroqDjsOTzoUGzg",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "ce7dedd8-988e-48fe-8609-44f9259a6540"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 176000,
+          "amount_paid": 176000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMQ0200gfojU4ds?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMQ0200gfojU4ds/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -24000,
+                "amount_excluding_tax": -24000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -24000,
+                  "unit_amount_decimal": "-24000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-24000"
+              },
+              {
+                "amount": 200000,
+                "amount_excluding_tax": 200000,
+                "currency": "usd",
+                "description": "Zulip Business",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhurADEQaroqDjsxdDNJRBA",
+      "id": "evt_1OqSsLDEQaroqDjszhMf6nLl",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "442aed18-c0f3-432d-9d7c-2df58e804cf0"
+        "idempotency_key": "ce7dedd8-988e-48fe-8609-44f9259a6540"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.4.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.4.json
index 8dcef0e8d9..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 176000,
-          "amount_paid": 176000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA40200vXGxngw3?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA40200vXGxngw3/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -24000,
-                "amount_excluding_tax": -24000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -24000,
-                  "unit_amount_decimal": "-24000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-24000"
-              },
-              {
-                "amount": 200000,
-                "amount_excluding_tax": 200000,
-                "currency": "usd",
-                "description": "Zulip Business",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 25,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "25",
-            "plan_tier": "104"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Business",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 176000,
-          "subtotal_excluding_tax": 176000,
-          "tax": null,
-          "test_clock": null,
-          "total": 176000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 176000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhurADEQaroqDjsg7CHAGRq",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "442aed18-c0f3-432d-9d7c-2df58e804cf0"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.5.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.create.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.create.1.json
index 8f204802be..871a278cdc 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.finalize_invoice.1.json
index a05a0d7a0b..97c09199ac 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA10200spjgVBtk?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjI5OQ0200RtuRFboI?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA10200spjgVBtk/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjI5OQ0200RtuRFboI/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.pay.1.json
index d2ebe69a03..d174da654d 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA30200xiFtWNYe?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMA0200wpz5BoNv?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lveTBBcFJOZHdONDNiWlhjTjJOa3pEc0d1T3p1LDk4MDI4OTA30200xiFtWNYe/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WT0xmZVZqQ0hsMDREdTRzMkNEbkd2TXV6RU1zLDEwMDA2NjMwMA0200wpz5BoNv/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.create.1.json
index c7a98d66b6..5fd6442319 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohur1DEQaroqDjsV9PqGfRy_secret_PWyoXZrHyJRSuE6V7MDFe8I7SOX0vnY",
+  "client_secret": "seti_1OqSsDDEQaroqDjs7OEygCXN_secret_PfoVwdTu5jo5jN5SdMl4pNriZZNwH7J",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohur1DEQaroqDjsV9PqGfRy",
+  "id": "seti_1OqSsDDEQaroqDjs7OEygCXN",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohur1DEQaroqDjsxwtgvCZ0",
+  "latest_attempt": "setatt_1OqSsDDEQaroqDjsVOFLNJJ3",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+  "payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.list.1.json
index 41eca6ca79..b8b69b7886 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohur0DEQaroqDjsugIvutHv_secret_PWyoAp7sSMpVdvV60X6OyQbw4NTvDG8",
+      "client_secret": "seti_1OqSsCDEQaroqDjs9kgofXGO_secret_PfoV1yPDKYfwYlaFve8wVd3TczDbk20",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohur0DEQaroqDjsugIvutHv",
+      "id": "seti_1OqSsCDEQaroqDjs9kgofXGO",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.retrieve.1.json
index c7a98d66b6..5fd6442319 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohur1DEQaroqDjsV9PqGfRy_secret_PWyoXZrHyJRSuE6V7MDFe8I7SOX0vnY",
+  "client_secret": "seti_1OqSsDDEQaroqDjs7OEygCXN_secret_PfoVwdTu5jo5jN5SdMl4pNriZZNwH7J",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohur1DEQaroqDjsV9PqGfRy",
+  "id": "seti_1OqSsDDEQaroqDjs7OEygCXN",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohur1DEQaroqDjsxwtgvCZ0",
+  "latest_attempt": "setatt_1OqSsDDEQaroqDjsVOFLNJJ3",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohur1DEQaroqDjsZaINjuPw",
+  "payment_method": "pm_1OqSsDDEQaroqDjssRFPEqYa",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.create.1.json
index 28937f353a..073e0e304f 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02vKo10qN7q5SVPVCjzlA4ELZvcczrN4Q9s9K07C5GOMjWAd",
+  "id": "cs_test_NORMALIZED02fZrRV7XVq9A9GRIqAz5tllmRZlQON1f2A8LbMqg0y06DzP",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "7",
+    "remote_server_user_id": "8",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohur0DEQaroqDjsugIvutHv",
+  "setup_intent": "seti_1OqSsCDEQaroqDjs9kgofXGO",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vKo10qN7q5SVPVCjzlA4ELZvcczrN4Q9s9K07C5GOMjWAd#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02fZrRV7XVq9A9GRIqAz5tllmRZlQON1f2A8LbMqg0y06DzP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.list.1.json
index 9983612e7a..2af7919b49 100644
--- a/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02vKo10qN7q5SVPVCjzlA4ELZvcczrN4Q9s9K07C5GOMjWAd",
+      "id": "cs_test_NORMALIZED02fZrRV7XVq9A9GRIqAz5tllmRZlQON1f2A8LbMqg0y06DzP",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "7",
+        "remote_server_user_id": "8",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohur0DEQaroqDjsugIvutHv",
+      "setup_intent": "seti_1OqSsCDEQaroqDjs9kgofXGO",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vKo10qN7q5SVPVCjzlA4ELZvcczrN4Q9s9K07C5GOMjWAd#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02fZrRV7XVq9A9GRIqAz5tllmRZlQON1f2A8LbMqg0y06DzP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.1.json
index c177285fb4..925d444900 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+    "default_payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.2.json
index 5a8e8b4f90..cfba40dc12 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.2.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+    "default_payment_method": "pm_1OqSlRDEQaroqDjs9awX6i42",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.3.json
index 0d487954be..4fadc8607f 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.3.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhulDDEQaroqDjs37bDdq35",
+    "default_payment_method": "pm_1OqSlXDEQaroqDjssN4QCZOF",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.1.json
index 8767319f9d..70c4884a00 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+      "id": "pm_1OqSlEDEQaroqDjsppYrr8OV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.2.json
index 8767319f9d..70c4884a00 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+      "id": "pm_1OqSlEDEQaroqDjsppYrr8OV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.3.json
index 8767319f9d..70c4884a00 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+      "id": "pm_1OqSlEDEQaroqDjsppYrr8OV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.4.json
index 8767319f9d..70c4884a00 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+      "id": "pm_1OqSlEDEQaroqDjsppYrr8OV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.5.json
index ffbc02334b..64f1296ee8 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000002",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+      "id": "pm_1OqSlRDEQaroqDjs9awX6i42",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.7.json b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.7.json
index d6a03563af..f44d9b18c4 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.7.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.7.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "mastercard",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000003",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulDDEQaroqDjs37bDdq35",
+      "id": "pm_1OqSlXDEQaroqDjssN4QCZOF",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.1.json
index 39abd1bf5b..4ffd572bdd 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+            "default_payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhukvDEQaroqDjsG5KzhTHc",
+      "id": "evt_1OqSlGDEQaroqDjshIHH5R8N",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "0f98a437-c065-45e5-990e-9c39e7487927"
+        "idempotency_key": "d679041d-e427-4e6e-814e-71b86dbde7f6"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.2.json
index afe3766c70..422783baa9 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+                "payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKO_jmK4GMgZ3AJXwHiI6LBa_fO4b6Je-WFX67zNFFCDYauwcOgQrmsnHse9g7CLJe5h6EU4tReOIWVqt?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMuQla8GMgY7ZzmlRQM6LBZ0X4e6SEtswpESQA6xxfVzpibR1jQH_jLgLHxCCmFMAWcl5onpoAQGVowD?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_9CjvQoBIVJIQaUZ6ansHJhaFA",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_bhVOlK8fKZU8t4i5VEUDxaZzr",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+          "payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhukyDEQaroqDjs1NzWhvNg",
+      "id": "evt_3OqSlJDEQaroqDjs1RblKoon",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "42f462e7-b963-43a7-93b4-4e77d22ff01a"
+        "idempotency_key": "390c6eb6-c3d4-446a-878d-351ce6233498"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMuQla8GMgaoiJRH4QA6LBba-2udYU3sap3cgbT7StwkdfnT_5BWiRoFiRMA4RSDpECXKhGjIm2CSBOw?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSlJDEQaroqDjs1eIXklcc",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "390c6eb6-c3d4-446a-878d-351ce6233498"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI10200uJtlyyz3?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2NQ02002h5EqMwc?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI10200uJtlyyz3/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2NQ02002h5EqMwc/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -361,16 +490,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhukzDEQaroqDjsdNHEW5R3",
+      "id": "evt_1OqSlKDEQaroqDjsrlPRCOYP",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "1dd3c0da-eecd-4f7a-a099-774e11db4a18"
+        "idempotency_key": "289806cc-f0d4-4d03-8374-836c5a2d38fb"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI002006aiTlIge?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2NQ02002h5EqMwc?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI002006aiTlIge/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2NQ02002h5EqMwc/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -544,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhukzDEQaroqDjsb1Lepigs",
+      "id": "evt_1OqSlJDEQaroqDjsPX2sbon1",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "1dd3c0da-eecd-4f7a-a099-774e11db4a18"
+        "idempotency_key": "289806cc-f0d4-4d03-8374-836c5a2d38fb"
       },
       "type": "invoice.updated"
     },
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_9CjvQoBIVJIQaUZ6ansHJhaFA",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_bhVOlK8fKZU8t4i5VEUDxaZzr",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhukyDEQaroqDjs1YRyqCpI",
+      "id": "evt_3OqSlJDEQaroqDjs1bOwpk9d",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "1dd3c0da-eecd-4f7a-a099-774e11db4a18"
+        "idempotency_key": "289806cc-f0d4-4d03-8374-836c5a2d38fb"
       },
       "type": "payment_intent.created"
     },
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -821,16 +952,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhukyDEQaroqDjsLZbzvaeN",
+      "id": "evt_1OqSlIDEQaroqDjsoyHkYmrb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "24267ccb-990f-44c6-ba08-525a0797c700"
+        "idempotency_key": "661218d1-610b-402e-b2c5-18b22c28a7ef"
       },
       "type": "invoice.created"
     },
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhukxDEQaroqDjsvYq3Vm1J",
+      "id": "evt_1OqSlIDEQaroqDjsQ6EV5xC0",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "c0c25f1c-8519-4c59-b8ef-8aba04d70453"
+        "idempotency_key": "f4a2b26e-845a-4d25-becb-08abc0b08d71"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+            "default_payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhukxDEQaroqDjsC6rp3SWm",
+      "id": "evt_1OqSlIDEQaroqDjsho4kD0hO",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "c0c25f1c-8519-4c59-b8ef-8aba04d70453"
+        "idempotency_key": "f4a2b26e-845a-4d25-becb-08abc0b08d71"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.3.json
index 5789d82c36..cfac8ebe83 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,197 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohul1DEQaroqDjsP9Ladp2v",
+      "id": "evt_1OqSlLDEQaroqDjsMIiCSKO2",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "42f462e7-b963-43a7-93b4-4e77d22ff01a"
+        "idempotency_key": "390c6eb6-c3d4-446a-878d-351ce6233498"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSlLDEQaroqDjsJcFHzXMO",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "390c6eb6-c3d4-446a-878d-351ce6233498"
       },
       "type": "invoice.paid"
     },
@@ -230,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -368,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1Ohul1DEQaroqDjs30Iuu5bA",
+      "id": "evt_1OqSlLDEQaroqDjsvNysIgdE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "42f462e7-b963-43a7-93b4-4e77d22ff01a"
+        "idempotency_key": "390c6eb6-c3d4-446a-878d-351ce6233498"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.4.json b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.4.json
index c5f13c1c68..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.4.json
@@ -1,189 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1Ohul1DEQaroqDjsKV6l2Z0E",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "42f462e7-b963-43a7-93b4-4e77d22ff01a"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.5.json b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.1.json
index f4f30938d0..347fe6644d 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.2.json
index c5e46554da..66ea826ec3 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": true,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 5000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.1.json
index 303f639180..6317ddeb07 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI002006aiTlIge?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2NQ02002h5EqMwc?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI002006aiTlIge/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2NQ02002h5EqMwc/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.2.json
index 2878cddcb0..7e666f889e 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTMw02005VKOn1nH?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg3MA0200DaQbrVRE?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTMw02005VKOn1nH/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg3MA0200DaQbrVRE/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": true,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 5000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.2.json
index ed0b2cf455..050a4cbe05 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTM10200sB8j8QPL?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg3NQ0200zCSPyddP?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTM10200sB8j8QPL/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg3NQ0200zCSPyddP/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": true,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.3.json
index 6cf7d59213..3fdb32c37d 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.3.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTQx0200pA2fGcGh?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg4Mg0200w8mC89vL?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTQx0200pA2fGcGh/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg4Mg0200w8mC89vL/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": true,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.4.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.4.json
index f169e4f2f4..a98f6042df 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.4.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.4.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTQ00200PZdnksUa?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg4NA0200tURDZIXi?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTQ00200PZdnksUa/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg4NA0200tURDZIXi/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": true,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTQ00200u7SdTaiW?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg4NA0200dEkd5qxR?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTQ00200u7SdTaiW/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg4NA0200dEkd5qxR/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.1.json
index 28dea56bf6..f9f7e2fb80 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpWlU1azJlcG5pbFlrZkVYZW84a01wb1RpUWg2LDk4MDI4NTI302006jqdvgGK/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PaENBUDRtNzU3WlpZbDBBWW0zRnhEUk1VNWRILDEwMDA2NTg2Nw0200s4zPcyIS/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.2.json
index b4ecda4649..a2d1135f5e 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.2.json
@@ -74,7 +74,7 @@
             },
             "paid": false,
             "payment_intent": "pi_NORMALIZED00000000000002",
-            "payment_method": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+            "payment_method": "pm_1OqSlRDEQaroqDjs9awX6i42",
             "payment_method_details": {
               "card": {
                 "amount_authorized": null,
@@ -85,7 +85,7 @@
                   "cvc_check": "pass"
                 },
                 "country": "US",
-                "exp_month": 2,
+                "exp_month": 3,
                 "exp_year": 2025,
                 "extended_authorization": {
                   "status": "disabled"
@@ -136,7 +136,7 @@
         "total_count": 1,
         "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
       },
-      "client_secret": "pi_NORMALIZED00000000000002_secret_LZyivbd4ejVJOPEHkWLg14pbP",
+      "client_secret": "pi_NORMALIZED00000000000002_secret_o8tn9MajtqGti827ArlGHtqFF",
       "confirmation_method": "automatic",
       "created": 1000000000,
       "currency": "usd",
@@ -172,7 +172,8 @@
               "cvc_check": "pass"
             },
             "country": "US",
-            "exp_month": 2,
+            "display_brand": "visa",
+            "exp_month": 3,
             "exp_year": 2025,
             "fingerprint": "NORMALIZED000002",
             "funding": "credit",
@@ -191,7 +192,7 @@
           },
           "created": 1000000000,
           "customer": "cus_NORMALIZED0001",
-          "id": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+          "id": "pm_1OqSlRDEQaroqDjs9awX6i42",
           "livemode": false,
           "metadata": {},
           "object": "payment_method",
@@ -254,7 +255,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000002",
         "funding": "credit",
@@ -273,13 +275,13 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+      "id": "pm_1OqSlRDEQaroqDjs9awX6i42",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
       "type": "card"
     },
-    "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0006?t=1707487735",
+    "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0006?t=1709525075",
     "setup_intent": null,
     "source": null,
     "type": "card_error"
@@ -292,11 +294,11 @@
     "Access-Control-Max-Age": "300",
     "Cache-Control": "no-cache, no-store",
     "Connection": "keep-alive",
-    "Content-Length": "9104",
+    "Content-Length": "9174",
     "Content-Security-Policy": "report-uri https://q.stripe.com/csp-report?p=v1%2Finvoices%2F%3Ainvoice%2Fpay; block-all-mixed-content; default-src 'none'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; img-src 'self'; script-src 'self' 'report-sample'; style-src 'self'",
     "Content-Type": "application/json",
     "Date": "NORMALIZED DATETIME",
-    "Idempotency-Key": "2c1791c9-eb08-4c83-b2b4-9a9ad5eebd94",
+    "Idempotency-Key": "32b8d766-59c8-450c-90b5-5e49245b1642",
     "Original-Request": "req_NORMALIZED0006",
     "Request-Id": "req_NORMALIZED0006",
     "Server": "nginx",
@@ -304,10 +306,9 @@
     "Stripe-Should-Retry": "false",
     "Stripe-Version": "2020-08-27",
     "Vary": "Origin",
-    "X-Stripe-Non-Api-Overhead-Duration-Ms": "1158.9999999999998",
     "X-Stripe-Routing-Context-Priority-Tier": "api-testmode"
   },
-  "http_body": "{\"error\": {\"charge\": \"ch_NORMALIZED00000000000002\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_intent\": {\"id\": \"pi_NORMALIZED00000000000002\", \"object\": \"payment_intent\", \"amount\": 5000, \"amount_capturable\": 0, \"amount_details\": {\"tip\": {}}, \"amount_received\": 0, \"application\": null, \"application_fee_amount\": null, \"automatic_payment_methods\": null, \"canceled_at\": null, \"cancellation_reason\": null, \"capture_method\": \"automatic\", \"charges\": {\"object\": \"list\", \"data\": [{\"id\": \"ch_NORMALIZED00000000000002\", \"object\": \"charge\", \"amount\": 5000, \"amount_captured\": 0, \"amount_refunded\": 0, \"application\": null, \"application_fee\": null, \"application_fee_amount\": null, \"balance_transaction\": null, \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"calculated_statement_descriptor\": \"ZULIP\", \"captured\": false, \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"destination\": null, \"dispute\": null, \"disputed\": false, \"failure_balance_transaction\": null, \"failure_code\": \"card_declined\", \"failure_message\": \"Your card was declined.\", \"fraud_details\": {}, \"invoice\": \"in_NORMALIZED00000000000002\", \"livemode\": false, \"metadata\": {}, \"on_behalf_of\": null, \"order\": null, \"outcome\": {\"network_status\": \"declined_by_network\", \"reason\": \"generic_decline\", \"risk_level\": \"normal\", \"risk_score\": 52, \"seller_message\": \"The bank did not return any further details with this decline.\", \"type\": \"issuer_declined\"}, \"paid\": false, \"payment_intent\": \"pi_NORMALIZED00000000000002\", \"payment_method\": \"pm_1Ohul7DEQaroqDjs2WhK4YhI\", \"payment_method_details\": {\"card\": {\"amount_authorized\": null, \"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"extended_authorization\": {\"status\": \"disabled\"}, \"fingerprint\": \"NORMALIZED000002\", \"funding\": \"credit\", \"incremental_authorization\": {\"status\": \"unavailable\"}, \"installments\": null, \"last4\": \"0341\", \"mandate\": null, \"multicapture\": {\"status\": \"unavailable\"}, \"network\": \"visa\", \"network_token\": {\"used\": false}, \"overcapture\": {\"maximum_amount_capturable\": 5000, \"status\": \"unavailable\"}, \"three_d_secure\": null, \"wallet\": null}, \"type\": \"card\"}, \"radar_options\": {}, \"receipt_email\": \"hamlet@zulip.com\", \"receipt_number\": null, \"receipt_url\": null, \"refunded\": false, \"refunds\": {\"object\": \"list\", \"data\": [], \"has_more\": false, \"total_count\": 0, \"url\": \"/v1/charges/ch_NORMALIZED00000000000002/refunds\"}, \"review\": null, \"shipping\": null, \"source\": null, \"source_transfer\": null, \"statement_descriptor\": null, \"statement_descriptor_suffix\": null, \"status\": \"failed\", \"transfer_data\": null, \"transfer_group\": null}], \"has_more\": false, \"total_count\": 1, \"url\": \"/v1/charges?payment_intent=pi_NORMALIZED00000000000002\"}, \"client_secret\": \"pi_NORMALIZED00000000000002_secret_LZyivbd4ejVJOPEHkWLg14pbP\", \"confirmation_method\": \"automatic\", \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"invoice\": \"in_NORMALIZED00000000000002\", \"last_payment_error\": {\"charge\": \"ch_NORMALIZED00000000000002\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1Ohul7DEQaroqDjs2WhK4YhI\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000002\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"type\": \"card_error\"}, \"latest_charge\": \"ch_NORMALIZED00000000000002\", \"livemode\": false, \"metadata\": {}, \"next_action\": null, \"on_behalf_of\": null, \"payment_method\": null, \"payment_method_configuration_details\": null, \"payment_method_options\": {\"card\": {\"installments\": null, \"mandate_options\": null, \"network\": null, \"request_three_d_secure\": \"automatic\"}, \"cashapp\": {}}, \"payment_method_types\": [\"card\", \"cashapp\"], \"processing\": null, \"receipt_email\": \"hamlet@zulip.com\", \"review\": null, \"setup_future_usage\": null, \"shipping\": null, \"source\": null, \"statement_descriptor\": null, \"statement_descriptor_suffix\": null, \"status\": \"requires_payment_method\", \"transfer_data\": null, \"transfer_group\": null}, \"payment_method\": {\"id\": \"pm_1Ohul7DEQaroqDjs2WhK4YhI\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000002\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"request_log_url\": \"https://dashboard.stripe.com/test/logs/req_NORMALIZED0006?t=1707487735\", \"type\": \"card_error\"}}",
+  "http_body": "{\"error\": {\"charge\": \"ch_NORMALIZED00000000000002\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_intent\": {\"id\": \"pi_NORMALIZED00000000000002\", \"object\": \"payment_intent\", \"amount\": 5000, \"amount_capturable\": 0, \"amount_details\": {\"tip\": {}}, \"amount_received\": 0, \"application\": null, \"application_fee_amount\": null, \"automatic_payment_methods\": null, \"canceled_at\": null, \"cancellation_reason\": null, \"capture_method\": \"automatic\", \"charges\": {\"object\": \"list\", \"data\": [{\"id\": \"ch_NORMALIZED00000000000002\", \"object\": \"charge\", \"amount\": 5000, \"amount_captured\": 0, \"amount_refunded\": 0, \"application\": null, \"application_fee\": null, \"application_fee_amount\": null, \"balance_transaction\": null, \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"calculated_statement_descriptor\": \"ZULIP\", \"captured\": false, \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"destination\": null, \"dispute\": null, \"disputed\": false, \"failure_balance_transaction\": null, \"failure_code\": \"card_declined\", \"failure_message\": \"Your card was declined.\", \"fraud_details\": {}, \"invoice\": \"in_NORMALIZED00000000000002\", \"livemode\": false, \"metadata\": {}, \"on_behalf_of\": null, \"order\": null, \"outcome\": {\"network_status\": \"declined_by_network\", \"reason\": \"generic_decline\", \"risk_level\": \"normal\", \"risk_score\": 47, \"seller_message\": \"The bank did not return any further details with this decline.\", \"type\": \"issuer_declined\"}, \"paid\": false, \"payment_intent\": \"pi_NORMALIZED00000000000002\", \"payment_method\": \"pm_1OqSlRDEQaroqDjs9awX6i42\", \"payment_method_details\": {\"card\": {\"amount_authorized\": null, \"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 3, \"exp_year\": 2025, \"extended_authorization\": {\"status\": \"disabled\"}, \"fingerprint\": \"NORMALIZED000002\", \"funding\": \"credit\", \"incremental_authorization\": {\"status\": \"unavailable\"}, \"installments\": null, \"last4\": \"0341\", \"mandate\": null, \"multicapture\": {\"status\": \"unavailable\"}, \"network\": \"visa\", \"network_token\": {\"used\": false}, \"overcapture\": {\"maximum_amount_capturable\": 5000, \"status\": \"unavailable\"}, \"three_d_secure\": null, \"wallet\": null}, \"type\": \"card\"}, \"radar_options\": {}, \"receipt_email\": \"hamlet@zulip.com\", \"receipt_number\": null, \"receipt_url\": null, \"refunded\": false, \"refunds\": {\"object\": \"list\", \"data\": [], \"has_more\": false, \"total_count\": 0, \"url\": \"/v1/charges/ch_NORMALIZED00000000000002/refunds\"}, \"review\": null, \"shipping\": null, \"source\": null, \"source_transfer\": null, \"statement_descriptor\": null, \"statement_descriptor_suffix\": null, \"status\": \"failed\", \"transfer_data\": null, \"transfer_group\": null}], \"has_more\": false, \"total_count\": 1, \"url\": \"/v1/charges?payment_intent=pi_NORMALIZED00000000000002\"}, \"client_secret\": \"pi_NORMALIZED00000000000002_secret_o8tn9MajtqGti827ArlGHtqFF\", \"confirmation_method\": \"automatic\", \"created\": 1000000000, \"currency\": \"usd\", \"customer\": \"cus_NORMALIZED0001\", \"description\": \"Payment for Invoice\", \"invoice\": \"in_NORMALIZED00000000000002\", \"last_payment_error\": {\"charge\": \"ch_NORMALIZED00000000000002\", \"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1OqSlRDEQaroqDjs9awX6i42\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"display_brand\": \"visa\", \"exp_month\": 3, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000002\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"type\": \"card_error\"}, \"latest_charge\": \"ch_NORMALIZED00000000000002\", \"livemode\": false, \"metadata\": {}, \"next_action\": null, \"on_behalf_of\": null, \"payment_method\": null, \"payment_method_configuration_details\": null, \"payment_method_options\": {\"card\": {\"installments\": null, \"mandate_options\": null, \"network\": null, \"request_three_d_secure\": \"automatic\"}, \"cashapp\": {}}, \"payment_method_types\": [\"card\", \"cashapp\"], \"processing\": null, \"receipt_email\": \"hamlet@zulip.com\", \"review\": null, \"setup_future_usage\": null, \"shipping\": null, \"source\": null, \"statement_descriptor\": null, \"statement_descriptor_suffix\": null, \"status\": \"requires_payment_method\", \"transfer_data\": null, \"transfer_group\": null}, \"payment_method\": {\"id\": \"pm_1OqSlRDEQaroqDjs9awX6i42\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"display_brand\": \"visa\", \"exp_month\": 3, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000002\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0341\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"request_log_url\": \"https://dashboard.stripe.com/test/logs/req_NORMALIZED0006?t=1709525075\", \"type\": \"card_error\"}}",
   "http_status": 402,
   "json_body": {
     "error": {
@@ -382,7 +383,7 @@
               },
               "paid": false,
               "payment_intent": "pi_NORMALIZED00000000000002",
-              "payment_method": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+              "payment_method": "pm_1OqSlRDEQaroqDjs9awX6i42",
               "payment_method_details": {
                 "card": {
                   "amount_authorized": null,
@@ -393,7 +394,7 @@
                     "cvc_check": "pass"
                   },
                   "country": "US",
-                  "exp_month": 2,
+                  "exp_month": 3,
                   "exp_year": 2025,
                   "extended_authorization": {
                     "status": "disabled"
@@ -450,7 +451,7 @@
           "total_count": 1,
           "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
         },
-        "client_secret": "pi_NORMALIZED00000000000002_secret_LZyivbd4ejVJOPEHkWLg14pbP",
+        "client_secret": "pi_NORMALIZED00000000000002_secret_o8tn9MajtqGti827ArlGHtqFF",
         "confirmation_method": "automatic",
         "created": 1000000000,
         "currency": "usd",
@@ -486,7 +487,8 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "display_brand": "visa",
+              "exp_month": 3,
               "exp_year": 2025,
               "fingerprint": "NORMALIZED000002",
               "funding": "credit",
@@ -505,7 +507,7 @@
             },
             "created": 1000000000,
             "customer": "cus_NORMALIZED0001",
-            "id": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+            "id": "pm_1OqSlRDEQaroqDjs9awX6i42",
             "livemode": false,
             "metadata": {},
             "object": "payment_method",
@@ -568,7 +570,8 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "display_brand": "visa",
+          "exp_month": 3,
           "exp_year": 2025,
           "fingerprint": "NORMALIZED000002",
           "funding": "credit",
@@ -587,13 +590,13 @@
         },
         "created": 1000000000,
         "customer": "cus_NORMALIZED0001",
-        "id": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+        "id": "pm_1OqSlRDEQaroqDjs9awX6i42",
         "livemode": false,
         "metadata": {},
         "object": "payment_method",
         "type": "card"
       },
-      "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0006?t=1707487735",
+      "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0006?t=1709525075",
       "type": "card_error"
     }
   },
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.3.json
index 748e6ba1f4..7abd5e9454 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTQz0200UTEWtsQ9?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg4Mw0200wbZDjESm?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpNE1PUFpiZGFnaDlBUmJHOXpRanpSWmhSVGpHLDk4MDI4NTQz0200UTEWtsQ9/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PanZHQ2s5NXRRRHdteDZnZUVVT3BSR2xJZmFMLDEwMDA2NTg4Mw0200wbZDjESm/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": true,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.1.json
index 9c115248c5..905442d062 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.1.json
@@ -20,7 +20,8 @@
       "cvc_check": "pass"
     },
     "country": "US",
-    "exp_month": 2,
+    "display_brand": "visa",
+    "exp_month": 3,
     "exp_year": 2025,
     "fingerprint": "NORMALIZED000002",
     "funding": "credit",
@@ -39,7 +40,7 @@
   },
   "created": 1000000000,
   "customer": null,
-  "id": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+  "id": "pm_1OqSlRDEQaroqDjs9awX6i42",
   "livemode": false,
   "metadata": {},
   "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.2.json
index ebcc7b0659..998e5c6d18 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.2.json
@@ -20,7 +20,8 @@
       "cvc_check": "pass"
     },
     "country": "US",
-    "exp_month": 2,
+    "display_brand": "visa",
+    "exp_month": 3,
     "exp_year": 2025,
     "fingerprint": "NORMALIZED000001",
     "funding": "credit",
@@ -39,7 +40,7 @@
   },
   "created": 1000000000,
   "customer": null,
-  "id": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+  "id": "pm_1OqSlEDEQaroqDjsppYrr8OV",
   "livemode": false,
   "metadata": {},
   "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.1.json
index 60c4ae96e2..075b993a4a 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.1.json
@@ -22,7 +22,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000002",
         "funding": "credit",
@@ -41,7 +42,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+      "id": "pm_1OqSlRDEQaroqDjs9awX6i42",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -69,7 +70,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -88,7 +90,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+      "id": "pm_1OqSlEDEQaroqDjsppYrr8OV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.2.json
index 6f68c969c4..0a775f1735 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.2.json
@@ -22,7 +22,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "mastercard",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000003",
         "funding": "credit",
@@ -41,7 +42,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulDDEQaroqDjs37bDdq35",
+      "id": "pm_1OqSlXDEQaroqDjssN4QCZOF",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.1.json
index 2bad4a22cc..bb9773524c 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuktDEQaroqDjsVu7vKDUg_secret_PWyiXXOKwOSvCjHMJg4pi7GXvDFrJBN",
+  "client_secret": "seti_1OqSlEDEQaroqDjshPkTRgkf_secret_PfoO8jCP0GCkPQLhO299b99TOZNMOrw",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuktDEQaroqDjsVu7vKDUg",
+  "id": "seti_1OqSlEDEQaroqDjshPkTRgkf",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuktDEQaroqDjsZHPWaDgX",
+  "latest_attempt": "setatt_1OqSlEDEQaroqDjshfawKKfc",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+  "payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.2.json
index b3b35fe694..876d3526e9 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.2.json
@@ -31,7 +31,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000004",
         "funding": "credit",
@@ -50,23 +51,23 @@
       },
       "created": 1000000000,
       "customer": null,
-      "id": "pm_1Ohul5DEQaroqDjsfrZt4YIp",
+      "id": "pm_1OqSlPDEQaroqDjs9CnC8AsJ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
       "type": "card"
     },
-    "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0007?t=1707487731",
+    "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0007?t=1709525071",
     "setup_intent": {
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohul5DEQaroqDjsEN62HwPS_secret_PWyiOngiAKQuPODpx0hZrLeNWFhdU2V",
+      "client_secret": "seti_1OqSlPDEQaroqDjslLQlumrz_secret_PfoOp4ZlHxvwgKNtNZ8Tvfs4m6muHDC",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohul5DEQaroqDjsEN62HwPS",
+      "id": "seti_1OqSlPDEQaroqDjslLQlumrz",
       "last_setup_error": {
         "code": "card_declined",
         "decline_code": "generic_decline",
@@ -94,7 +95,8 @@
               "cvc_check": "pass"
             },
             "country": "US",
-            "exp_month": 2,
+            "display_brand": "visa",
+            "exp_month": 3,
             "exp_year": 2025,
             "fingerprint": "NORMALIZED000004",
             "funding": "credit",
@@ -113,7 +115,7 @@
           },
           "created": 1000000000,
           "customer": null,
-          "id": "pm_1Ohul5DEQaroqDjsfrZt4YIp",
+          "id": "pm_1OqSlPDEQaroqDjs9CnC8AsJ",
           "livemode": false,
           "metadata": {},
           "object": "payment_method",
@@ -121,7 +123,7 @@
         },
         "type": "card_error"
       },
-      "latest_attempt": "setatt_1Ohul5DEQaroqDjsA2JDYV7P",
+      "latest_attempt": "setatt_1OqSlPDEQaroqDjsUsXzbU8I",
       "livemode": false,
       "mandate": null,
       "metadata": {},
@@ -155,11 +157,11 @@
     "Access-Control-Max-Age": "300",
     "Cache-Control": "no-cache, no-store",
     "Connection": "keep-alive",
-    "Content-Length": "4100",
+    "Content-Length": "4170",
     "Content-Security-Policy": "report-uri https://q.stripe.com/csp-report?p=v1%2Fsetup_intents; block-all-mixed-content; default-src 'none'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; img-src 'self'; script-src 'self' 'report-sample'; style-src 'self'",
     "Content-Type": "application/json",
     "Date": "NORMALIZED DATETIME",
-    "Idempotency-Key": "fcfe828e-3df5-4fce-9fc7-6f5abc6a96ea",
+    "Idempotency-Key": "8f76c789-72f9-4a20-bd4c-5d8135dddfc3",
     "Original-Request": "req_NORMALIZED0007",
     "Request-Id": "req_NORMALIZED0007",
     "Server": "nginx",
@@ -167,10 +169,9 @@
     "Stripe-Should-Retry": "false",
     "Stripe-Version": "2020-08-27",
     "Vary": "Origin",
-    "X-Stripe-Non-Api-Overhead-Duration-Ms": "786.0",
     "X-Stripe-Routing-Context-Priority-Tier": "api-testmode"
   },
-  "http_body": "{\"error\": {\"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1Ohul5DEQaroqDjsfrZt4YIp\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000004\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0002\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": null, \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"request_log_url\": \"https://dashboard.stripe.com/test/logs/req_NORMALIZED0007?t=1707487731\", \"setup_intent\": {\"id\": \"seti_1Ohul5DEQaroqDjsEN62HwPS\", \"object\": \"setup_intent\", \"application\": null, \"automatic_payment_methods\": null, \"cancellation_reason\": null, \"client_secret\": \"seti_1Ohul5DEQaroqDjsEN62HwPS_secret_PWyiOngiAKQuPODpx0hZrLeNWFhdU2V\", \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"description\": null, \"flow_directions\": null, \"last_setup_error\": {\"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1Ohul5DEQaroqDjsfrZt4YIp\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"exp_month\": 2, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000004\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0002\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": null, \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"type\": \"card_error\"}, \"latest_attempt\": \"setatt_1Ohul5DEQaroqDjsA2JDYV7P\", \"livemode\": false, \"mandate\": null, \"metadata\": {}, \"next_action\": null, \"on_behalf_of\": null, \"payment_method\": null, \"payment_method_configuration_details\": null, \"payment_method_options\": {\"card\": {\"mandate_options\": null, \"network\": null, \"request_three_d_secure\": \"automatic\"}}, \"payment_method_types\": [\"card\"], \"single_use_mandate\": null, \"status\": \"requires_payment_method\", \"usage\": \"off_session\"}, \"type\": \"card_error\"}}",
+  "http_body": "{\"error\": {\"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1OqSlPDEQaroqDjs9CnC8AsJ\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"display_brand\": \"visa\", \"exp_month\": 3, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000004\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0002\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": null, \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"request_log_url\": \"https://dashboard.stripe.com/test/logs/req_NORMALIZED0007?t=1709525071\", \"setup_intent\": {\"id\": \"seti_1OqSlPDEQaroqDjslLQlumrz\", \"object\": \"setup_intent\", \"application\": null, \"automatic_payment_methods\": null, \"cancellation_reason\": null, \"client_secret\": \"seti_1OqSlPDEQaroqDjslLQlumrz_secret_PfoOp4ZlHxvwgKNtNZ8Tvfs4m6muHDC\", \"created\": 1000000000, \"customer\": \"cus_NORMALIZED0001\", \"description\": null, \"flow_directions\": null, \"last_setup_error\": {\"code\": \"card_declined\", \"decline_code\": \"generic_decline\", \"doc_url\": \"https://stripe.com/docs/error-codes/card-declined\", \"message\": \"Your card was declined.\", \"payment_method\": {\"id\": \"pm_1OqSlPDEQaroqDjs9CnC8AsJ\", \"object\": \"payment_method\", \"billing_details\": {\"address\": {\"city\": null, \"country\": null, \"line1\": null, \"line2\": null, \"postal_code\": null, \"state\": null}, \"email\": null, \"name\": null, \"phone\": null}, \"card\": {\"brand\": \"visa\", \"checks\": {\"address_line1_check\": null, \"address_postal_code_check\": null, \"cvc_check\": \"pass\"}, \"country\": \"US\", \"display_brand\": \"visa\", \"exp_month\": 3, \"exp_year\": 2025, \"fingerprint\": \"NORMALIZED000004\", \"funding\": \"credit\", \"generated_from\": null, \"last4\": \"0002\", \"networks\": {\"available\": [\"visa\"], \"preferred\": null}, \"three_d_secure_usage\": {\"supported\": true}, \"wallet\": null}, \"created\": 1000000000, \"customer\": null, \"livemode\": false, \"metadata\": {}, \"type\": \"card\"}, \"type\": \"card_error\"}, \"latest_attempt\": \"setatt_1OqSlPDEQaroqDjsUsXzbU8I\", \"livemode\": false, \"mandate\": null, \"metadata\": {}, \"next_action\": null, \"on_behalf_of\": null, \"payment_method\": null, \"payment_method_configuration_details\": null, \"payment_method_options\": {\"card\": {\"mandate_options\": null, \"network\": null, \"request_three_d_secure\": \"automatic\"}}, \"payment_method_types\": [\"card\"], \"single_use_mandate\": null, \"status\": \"requires_payment_method\", \"usage\": \"off_session\"}, \"type\": \"card_error\"}}",
   "http_status": 402,
   "json_body": {
     "error": {
@@ -200,7 +201,8 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "display_brand": "visa",
+          "exp_month": 3,
           "exp_year": 2025,
           "fingerprint": "NORMALIZED000004",
           "funding": "credit",
@@ -219,23 +221,23 @@
         },
         "created": 1000000000,
         "customer": null,
-        "id": "pm_1Ohul5DEQaroqDjsfrZt4YIp",
+        "id": "pm_1OqSlPDEQaroqDjs9CnC8AsJ",
         "livemode": false,
         "metadata": {},
         "object": "payment_method",
         "type": "card"
       },
-      "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0007?t=1707487731",
+      "request_log_url": "https://dashboard.stripe.com/test/logs/req_NORMALIZED0007?t=1709525071",
       "setup_intent": {
         "application": null,
         "automatic_payment_methods": null,
         "cancellation_reason": null,
-        "client_secret": "seti_1Ohul5DEQaroqDjsEN62HwPS_secret_PWyiOngiAKQuPODpx0hZrLeNWFhdU2V",
+        "client_secret": "seti_1OqSlPDEQaroqDjslLQlumrz_secret_PfoOp4ZlHxvwgKNtNZ8Tvfs4m6muHDC",
         "created": 1000000000,
         "customer": "cus_NORMALIZED0001",
         "description": null,
         "flow_directions": null,
-        "id": "seti_1Ohul5DEQaroqDjsEN62HwPS",
+        "id": "seti_1OqSlPDEQaroqDjslLQlumrz",
         "last_setup_error": {
           "code": "card_declined",
           "decline_code": "generic_decline",
@@ -263,7 +265,8 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "display_brand": "visa",
+              "exp_month": 3,
               "exp_year": 2025,
               "fingerprint": "NORMALIZED000004",
               "funding": "credit",
@@ -282,7 +285,7 @@
             },
             "created": 1000000000,
             "customer": null,
-            "id": "pm_1Ohul5DEQaroqDjsfrZt4YIp",
+            "id": "pm_1OqSlPDEQaroqDjs9CnC8AsJ",
             "livemode": false,
             "metadata": {},
             "object": "payment_method",
@@ -290,7 +293,7 @@
           },
           "type": "card_error"
         },
-        "latest_attempt": "setatt_1Ohul5DEQaroqDjsA2JDYV7P",
+        "latest_attempt": "setatt_1OqSlPDEQaroqDjsUsXzbU8I",
         "livemode": false,
         "mandate": null,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.3.json
index 508e5bfeb5..d53fb802fd 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.3.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohul7DEQaroqDjsT6RGEeXL_secret_PWyiSVmlUNBXdqasymtd4uDr7aKZgDU",
+  "client_secret": "seti_1OqSlRDEQaroqDjsTIcI11C5_secret_PfoOsbha1WO8AjHFBygKspYgsyhSzQh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohul7DEQaroqDjsT6RGEeXL",
+  "id": "seti_1OqSlRDEQaroqDjsTIcI11C5",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohul7DEQaroqDjsPbthXE2O",
+  "latest_attempt": "setatt_1OqSlRDEQaroqDjsc3EuJffJ",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+  "payment_method": "pm_1OqSlRDEQaroqDjs9awX6i42",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.4.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.4.json
index 6385776cbe..a11937bfba 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.4.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.4.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhulDDEQaroqDjsG9EFXLpN_secret_PWyiGrsTEdoUqk4cAEdMqlIVRi6ACKu",
+  "client_secret": "seti_1OqSlXDEQaroqDjsHtldm0G9_secret_PfoORVKy8YgP61HtXMNOPVyHkFHSyWZ",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhulDDEQaroqDjsG9EFXLpN",
+  "id": "seti_1OqSlXDEQaroqDjsHtldm0G9",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhulDDEQaroqDjsSEzhxFvF",
+  "latest_attempt": "setatt_1OqSlXDEQaroqDjsM8hsExCk",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhulDDEQaroqDjs37bDdq35",
+  "payment_method": "pm_1OqSlXDEQaroqDjssN4QCZOF",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.1.json
index e271d88257..b45a2f58c2 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuksDEQaroqDjsZs23ZU57_secret_PWyiLL1pZiuKScn79B8Ekr0QPpS7jKF",
+      "client_secret": "seti_1OqSlDDEQaroqDjsm7pcBmcz_secret_PfoNltQkwGT6Y28xo4JaH7zS05TV6aD",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuksDEQaroqDjsZs23ZU57",
+      "id": "seti_1OqSlDDEQaroqDjsm7pcBmcz",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.2.json
index 318cb3878e..18b2f20689 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.2.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohul4DEQaroqDjsrmai9Bin_secret_PWyibdTxIEuVHNzK5BBWLTYNagHndN5",
+      "client_secret": "seti_1OqSlODEQaroqDjs1MPslxkf_secret_PfoO1iicxIqc9HXkOMQWE8qqciiPVAx",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohul4DEQaroqDjsrmai9Bin",
+      "id": "seti_1OqSlODEQaroqDjs1MPslxkf",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.3.json
index a9f0d2584d..2cc808fe97 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.3.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohul6DEQaroqDjsQG1qzAHy_secret_PWyi7FMZ6mOfx2XBRNDsYgNzqqBo1Fe",
+      "client_secret": "seti_1OqSlQDEQaroqDjs1gLvS1EI_secret_PfoOPgIRV0uNmlRsqQMDddr0zfM1tr7",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohul6DEQaroqDjsQG1qzAHy",
+      "id": "seti_1OqSlQDEQaroqDjs1gLvS1EI",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.4.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.4.json
index ce6fe5174a..4b320a3ef6 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.4.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.4.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhulCDEQaroqDjsVyEG7Lfs_secret_PWyihngpl0GpjqLT3hBdUVpZiunSFcG",
+      "client_secret": "seti_1OqSlXDEQaroqDjs2JwG4VWf_secret_PfoO3jFbAN7cqQzzVbdJOhPV9sBco8E",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhulCDEQaroqDjsVyEG7Lfs",
+      "id": "seti_1OqSlXDEQaroqDjs2JwG4VWf",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.1.json
index 2bad4a22cc..bb9773524c 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuktDEQaroqDjsVu7vKDUg_secret_PWyiXXOKwOSvCjHMJg4pi7GXvDFrJBN",
+  "client_secret": "seti_1OqSlEDEQaroqDjshPkTRgkf_secret_PfoO8jCP0GCkPQLhO299b99TOZNMOrw",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuktDEQaroqDjsVu7vKDUg",
+  "id": "seti_1OqSlEDEQaroqDjshPkTRgkf",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuktDEQaroqDjsZHPWaDgX",
+  "latest_attempt": "setatt_1OqSlEDEQaroqDjshfawKKfc",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuktDEQaroqDjsB7Ha2QWT",
+  "payment_method": "pm_1OqSlEDEQaroqDjsppYrr8OV",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.2.json
index 508e5bfeb5..d53fb802fd 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.2.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohul7DEQaroqDjsT6RGEeXL_secret_PWyiSVmlUNBXdqasymtd4uDr7aKZgDU",
+  "client_secret": "seti_1OqSlRDEQaroqDjsTIcI11C5_secret_PfoOsbha1WO8AjHFBygKspYgsyhSzQh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohul7DEQaroqDjsT6RGEeXL",
+  "id": "seti_1OqSlRDEQaroqDjsTIcI11C5",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohul7DEQaroqDjsPbthXE2O",
+  "latest_attempt": "setatt_1OqSlRDEQaroqDjsc3EuJffJ",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohul7DEQaroqDjs2WhK4YhI",
+  "payment_method": "pm_1OqSlRDEQaroqDjs9awX6i42",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.3.json
index 6385776cbe..a11937bfba 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.3.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhulDDEQaroqDjsG9EFXLpN_secret_PWyiGrsTEdoUqk4cAEdMqlIVRi6ACKu",
+  "client_secret": "seti_1OqSlXDEQaroqDjsHtldm0G9_secret_PfoORVKy8YgP61HtXMNOPVyHkFHSyWZ",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhulDDEQaroqDjsG9EFXLpN",
+  "id": "seti_1OqSlXDEQaroqDjsHtldm0G9",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhulDDEQaroqDjsSEzhxFvF",
+  "latest_attempt": "setatt_1OqSlXDEQaroqDjsM8hsExCk",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhulDDEQaroqDjs37bDdq35",
+  "payment_method": "pm_1OqSlXDEQaroqDjssN4QCZOF",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.1.json
index d0510ea326..11eafc71dc 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02IrGm9aYG4pEKTgJ0T3bE2hmy61RyUCAsGMiN4AXZn6L5cH",
+  "id": "cs_test_NORMALIZED02OOdbomMjzHP8FvhCAWQFCvQ9Thj2SIFHdscmUovLcScLZe",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuksDEQaroqDjsZs23ZU57",
+  "setup_intent": "seti_1OqSlDDEQaroqDjsm7pcBmcz",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02IrGm9aYG4pEKTgJ0T3bE2hmy61RyUCAsGMiN4AXZn6L5cH#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02OOdbomMjzHP8FvhCAWQFCvQ9Thj2SIFHdscmUovLcScLZe#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.2.json
index ac8c6a8c61..739bd4cc9d 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.2.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED03XI8DivyAwtEkZlBBl1gG8ekVt0Nniadto2wRE7NmULnlWg",
+  "id": "cs_test_NORMALIZED03fqEL9PZebldHJ7Jqo8mS3prdJ1KLHLx9nSE8EhFx97dZyj",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohul4DEQaroqDjsrmai9Bin",
+  "setup_intent": "seti_1OqSlODEQaroqDjs1MPslxkf",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03XI8DivyAwtEkZlBBl1gG8ekVt0Nniadto2wRE7NmULnlWg#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03fqEL9PZebldHJ7Jqo8mS3prdJ1KLHLx9nSE8EhFx97dZyj#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.3.json
index cc89b4213c..d7f2d8540c 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.3.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED04K1YVpEqCBL5rmHkBV6Uo9gUsnVZp0lBWSn0opIOcpTp3HP",
+  "id": "cs_test_NORMALIZED04hedtQXXt3BFEzS5YJuwhwr5nD4wMuQkgwp5tftLSmchHXd",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohul6DEQaroqDjsQG1qzAHy",
+  "setup_intent": "seti_1OqSlQDEQaroqDjs1gLvS1EI",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04K1YVpEqCBL5rmHkBV6Uo9gUsnVZp0lBWSn0opIOcpTp3HP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04hedtQXXt3BFEzS5YJuwhwr5nD4wMuQkgwp5tftLSmchHXd#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.4.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.4.json
index 6a10f115e8..811031da59 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.4.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.4.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED05vuqDQXFtyNYNlEkQ0PGTjXppPnpois53CdFVzFBqMEle43",
+  "id": "cs_test_NORMALIZED05bwZV5gdTWPSW0ZRHoEM5pS8jLLtkh4DVXmH8XeN6Nzjqzp",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhulCDEQaroqDjsVyEG7Lfs",
+  "setup_intent": "seti_1OqSlXDEQaroqDjs2JwG4VWf",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05vuqDQXFtyNYNlEkQ0PGTjXppPnpois53CdFVzFBqMEle43#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05bwZV5gdTWPSW0ZRHoEM5pS8jLLtkh4DVXmH8XeN6Nzjqzp#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.5.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.5.json
index 0bedb17c9d..e256348b26 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.5.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.5.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED06CjyWnt5yVuRd4yBWEcab4VVaOWujKMhuoCdp8unjyPPZ1B",
+  "id": "cs_test_NORMALIZED06KN2Pxip8wMD7NPB2t1N6Aq1kZhPOYb2s0v5xdK7M7GFnNk",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhulJDEQaroqDjs90EcVCeZ",
+  "setup_intent": "seti_1OqSlcDEQaroqDjscUQugOza",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED06CjyWnt5yVuRd4yBWEcab4VVaOWujKMhuoCdp8unjyPPZ1B#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED06KN2Pxip8wMD7NPB2t1N6Aq1kZhPOYb2s0v5xdK7M7GFnNk#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.1.json
index 6b78e3b711..ffebb99533 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02IrGm9aYG4pEKTgJ0T3bE2hmy61RyUCAsGMiN4AXZn6L5cH",
+      "id": "cs_test_NORMALIZED02OOdbomMjzHP8FvhCAWQFCvQ9Thj2SIFHdscmUovLcScLZe",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuksDEQaroqDjsZs23ZU57",
+      "setup_intent": "seti_1OqSlDDEQaroqDjsm7pcBmcz",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02IrGm9aYG4pEKTgJ0T3bE2hmy61RyUCAsGMiN4AXZn6L5cH#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02OOdbomMjzHP8FvhCAWQFCvQ9Thj2SIFHdscmUovLcScLZe#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.2.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.2.json
index dd5c285eb9..3284af1f69 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.2.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.2.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED04K1YVpEqCBL5rmHkBV6Uo9gUsnVZp0lBWSn0opIOcpTp3HP",
+      "id": "cs_test_NORMALIZED04hedtQXXt3BFEzS5YJuwhwr5nD4wMuQkgwp5tftLSmchHXd",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohul6DEQaroqDjsQG1qzAHy",
+      "setup_intent": "seti_1OqSlQDEQaroqDjs1gLvS1EI",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04K1YVpEqCBL5rmHkBV6Uo9gUsnVZp0lBWSn0opIOcpTp3HP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED04hedtQXXt3BFEzS5YJuwhwr5nD4wMuQkgwp5tftLSmchHXd#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.3.json b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.3.json
index 0c57e67185..0a2398fa11 100644
--- a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.3.json
+++ b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.3.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED05vuqDQXFtyNYNlEkQ0PGTjXppPnpois53CdFVzFBqMEle43",
+      "id": "cs_test_NORMALIZED05bwZV5gdTWPSW0ZRHoEM5pS8jLLtkh4DVXmH8XeN6Nzjqzp",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhulCDEQaroqDjsVyEG7Lfs",
+      "setup_intent": "seti_1OqSlXDEQaroqDjs2JwG4VWf",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05vuqDQXFtyNYNlEkQ0PGTjXppPnpois53CdFVzFBqMEle43#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED05bwZV5gdTWPSW0ZRHoEM5pS8jLLtkh4DVXmH8XeN6Nzjqzp#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.create.1.json
index 69a59a96f6..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.create.1.json
@@ -1,16 +1,16 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708008524,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver f267ada0-3e8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PZEia820z9Zo16",
-  "invoice_prefix": "4B9E7A40",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": null,
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.modify.1.json
index 8105687285..90ae0121c4 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.modify.1.json
@@ -1,26 +1,26 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708008524,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver f267ada0-3e8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PZEia820z9Zo16",
-  "invoice_prefix": "4B9E7A40",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+    "default_payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.1.json
index 26d88ba7d9..3021a5e4fa 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.1.json
@@ -1,16 +1,16 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708008524,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver f267ada0-3e8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PZEia820z9Zo16",
-  "invoice_prefix": "4B9E7A40",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708008528,
-      "customer": "cus_PZEia820z9Zo16",
-      "id": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -67,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.2.json
index 26d88ba7d9..3021a5e4fa 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.2.json
@@ -1,16 +1,16 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708008524,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver f267ada0-3e8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PZEia820z9Zo16",
-  "invoice_prefix": "4B9E7A40",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708008528,
-      "customer": "cus_PZEia820z9Zo16",
-      "id": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -67,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.3.json
index 26d88ba7d9..3021a5e4fa 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.3.json
@@ -1,16 +1,16 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708008524,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver f267ada0-3e8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PZEia820z9Zo16",
-  "invoice_prefix": "4B9E7A40",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708008528,
-      "customer": "cus_PZEia820z9Zo16",
-      "id": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -67,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.4.json
index 26d88ba7d9..3021a5e4fa 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.4.json
@@ -1,16 +1,16 @@
 {
   "address": null,
   "balance": 0,
-  "created": 1708008524,
+  "created": 1000000000,
   "currency": null,
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver f267ada0-3e8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_PZEia820z9Zo16",
-  "invoice_prefix": "4B9E7A40",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
     "default_payment_method": {
@@ -36,9 +36,9 @@
         },
         "country": "US",
         "display_brand": "visa",
-        "exp_month": 2,
+        "exp_month": 3,
         "exp_year": 2025,
-        "fingerprint": "9XKsMixKBi6kIIzd",
+        "fingerprint": "NORMALIZED000001",
         "funding": "credit",
         "generated_from": null,
         "last4": "4242",
@@ -53,9 +53,9 @@
         },
         "wallet": null
       },
-      "created": 1708008528,
-      "customer": "cus_PZEia820z9Zo16",
-      "id": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
+      "id": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -67,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.1.json
index e1a91b358e..a9798e49da 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.1.json
@@ -2,31 +2,31 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1708008530,
+      "created": 1000000000,
       "data": {
         "object": {
           "address": null,
           "balance": 0,
-          "created": 1708008524,
+          "created": 1000000000,
           "currency": null,
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver f267ada0-3e8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
-          "id": "cus_PZEia820z9Zo16",
-          "invoice_prefix": "4B9E7A40",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+            "default_payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1Ok6F4DEQaroqDjsJu5X6t4Y",
+      "id": "evt_1OqSpKDEQaroqDjsrpTZn8gF",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_8NjCZNZ5aDC1O9",
-        "idempotency_key": "38b06a5f-0d53-4a42-a7a5-82ed4a3fad9f"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "3e802031-edc6-4e35-8f46-c3eb4e0f11d3"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.2.json
index 5f8d172cc3..36aac8c158 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.2.json
@@ -2,7 +2,7 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1708008536,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": 10000,
@@ -26,7 +26,7 @@
                 "application": null,
                 "application_fee": null,
                 "application_fee_amount": null,
-                "balance_transaction": "txn_3Ok6F8DEQaroqDjs1CHa9XYm",
+                "balance_transaction": "txn_NORMALIZED00000000000001",
                 "billing_details": {
                   "address": {
                     "city": null,
@@ -42,9 +42,9 @@
                 },
                 "calculated_statement_descriptor": "ZULIP BASIC",
                 "captured": true,
-                "created": 1708008535,
+                "created": 1000000000,
                 "currency": "usd",
-                "customer": "cus_PZEia820z9Zo16",
+                "customer": "cus_NORMALIZED0001",
                 "description": "Payment for Invoice",
                 "destination": null,
                 "dispute": null,
@@ -53,8 +53,8 @@
                 "failure_code": null,
                 "failure_message": null,
                 "fraud_details": {},
-                "id": "ch_3Ok6F8DEQaroqDjs177d5Sdi",
-                "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
+                "id": "ch_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "charge",
@@ -64,13 +64,13 @@
                   "network_status": "approved_by_network",
                   "reason": null,
                   "risk_level": "normal",
-                  "risk_score": 10,
+                  "risk_score": 0,
                   "seller_message": "Payment complete.",
                   "type": "authorized"
                 },
                 "paid": true,
-                "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
-                "payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+                "payment_intent": "pi_NORMALIZED00000000000001",
+                "payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 10000,
@@ -81,12 +81,12 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
                     },
-                    "fingerprint": "9XKsMixKBi6kIIzd",
+                    "fingerprint": "NORMALIZED000001",
                     "funding": "credit",
                     "incremental_authorization": {
                       "status": "unavailable"
@@ -113,14 +113,14 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNjIuK4GMgbBolM-Izg6LBYDMQVCrWx64-7eGjfrGkE4poE6EXqpdTF4kibskZU5nldiNtNcbF0an9UO?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMeSla8GMgYEGcha3sc6LBaB9zzoODUwi5c33JUsMjPqjp4F14WwlHuXOGaN27_vcBKCoSeTq3ZyRBph?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
                   "has_more": false,
                   "object": "list",
                   "total_count": 0,
-                  "url": "/v1/charges/ch_3Ok6F8DEQaroqDjs177d5Sdi/refunds"
+                  "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
                 },
                 "review": null,
                 "shipping": null,
@@ -136,24 +136,24 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/charges?payment_intent=pi_3Ok6F8DEQaroqDjs1alKvD7i"
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_3Ok6F8DEQaroqDjs1alKvD7i_secret_FZ8ygIrElKjBNSpvPDw0ha4CZ",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_HGrreySJxfvWNq35niC40cN10",
           "confirmation_method": "automatic",
-          "created": 1708008534,
+          "created": 1000000000,
           "currency": "usd",
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
-          "id": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
-          "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
           "last_payment_error": null,
-          "latest_charge": "ch_3Ok6F8DEQaroqDjs177d5Sdi",
+          "latest_charge": "ch_NORMALIZED00000000000001",
           "livemode": false,
           "metadata": {},
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+          "payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,19 +181,19 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ok6F8DEQaroqDjs1CRZmkvk",
+      "id": "evt_3OqSpNDEQaroqDjs062XD6BM",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_5NAIOMLpXXEH9L",
-        "idempotency_key": "6368f02d-e32c-4037-9d6b-d9fb092f5ee5"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bf61dbdc-c1eb-4734-aef8-e7822b796eaf"
       },
       "type": "payment_intent.succeeded"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008536,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": 10000,
@@ -202,7 +202,7 @@
           "application": null,
           "application_fee": null,
           "application_fee_amount": null,
-          "balance_transaction": "txn_3Ok6F8DEQaroqDjs1CHa9XYm",
+          "balance_transaction": "txn_NORMALIZED00000000000001",
           "billing_details": {
             "address": {
               "city": null,
@@ -218,9 +218,9 @@
           },
           "calculated_statement_descriptor": "ZULIP BASIC",
           "captured": true,
-          "created": 1708008535,
+          "created": 1000000000,
           "currency": "usd",
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
           "destination": null,
           "dispute": null,
@@ -229,8 +229,8 @@
           "failure_code": null,
           "failure_message": null,
           "fraud_details": {},
-          "id": "ch_3Ok6F8DEQaroqDjs177d5Sdi",
-          "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
           "livemode": false,
           "metadata": {},
           "object": "charge",
@@ -240,13 +240,13 @@
             "network_status": "approved_by_network",
             "reason": null,
             "risk_level": "normal",
-            "risk_score": 10,
+            "risk_score": 0,
             "seller_message": "Payment complete.",
             "type": "authorized"
           },
           "paid": true,
-          "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
-          "payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
           "payment_method_details": {
             "card": {
               "amount_authorized": 10000,
@@ -257,12 +257,12 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
               },
-              "fingerprint": "9XKsMixKBi6kIIzd",
+              "fingerprint": "NORMALIZED000001",
               "funding": "credit",
               "incremental_authorization": {
                 "status": "unavailable"
@@ -289,14 +289,14 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNnIuK4GMgZzKyUassg6LBa4SAPFrNtOPZwVqgtyTjdwxvulBWDa43c96J7nKX7u2dQpCZgqupOm4fdJ?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMeSla8GMgYKY-z-NU46LBbD3y3cwQBqB2qrqqdlm_W5NApbN-lhnkMJhBCj4tq6oKlVoXH0fsNHSmjd?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
             "has_more": false,
             "object": "list",
             "total_count": 0,
-            "url": "/v1/charges/ch_3Ok6F8DEQaroqDjs177d5Sdi/refunds"
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
           },
           "review": null,
           "shipping": null,
@@ -309,19 +309,19 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ok6F8DEQaroqDjs1ZhWyINC",
+      "id": "evt_3OqSpNDEQaroqDjs01v3OfHq",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_5NAIOMLpXXEH9L",
-        "idempotency_key": "6368f02d-e32c-4037-9d6b-d9fb092f5ee5"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bf61dbdc-c1eb-4734-aef8-e7822b796eaf"
       },
       "type": "charge.succeeded"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008534,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -344,10 +344,10 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1708008533,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -362,13 +362,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708008534,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM10200tXvRivBK?s=ap",
-          "id": "in_1Ok6F7DEQaroqDjslOe91xON",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM10200tXvRivBK/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOA0200DVfwPgbh?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOA0200DVfwPgbh/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -384,30 +384,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-                "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-                "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708008533,
-                  "start": 1708008533
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1706114464,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -431,7 +431,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -441,19 +441,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "4B9E7A40-0001",
+          "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708008533,
-          "period_start": 1708008533,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -471,7 +471,7 @@
           "statement_descriptor": "Zulip Basic",
           "status": "open",
           "status_transitions": {
-            "finalized_at": 1708008534,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
             "paid_at": null,
             "voided_at": null
@@ -489,22 +489,22 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": 1708008534
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ok6F9DEQaroqDjsWqyWrElg",
+      "id": "evt_1OqSpODEQaroqDjsnLq3wYOA",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_cqaAW920i6zF2h",
-        "idempotency_key": "d67722fa-2db8-4b94-b2d9-b98eaa501d38"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "a1abf638-7259-4f7c-97a8-cfb835679061"
       },
       "type": "invoice.finalized"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008534,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -527,10 +527,10 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1708008533,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -545,13 +545,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708008534,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM10200tXvRivBK?s=ap",
-          "id": "in_1Ok6F7DEQaroqDjslOe91xON",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM10200tXvRivBK/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOA0200DVfwPgbh?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOA0200DVfwPgbh/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -567,30 +567,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-                "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-                "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708008533,
-                  "start": 1708008533
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1706114464,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -614,7 +614,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -624,19 +624,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "4B9E7A40-0001",
+          "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708008533,
-          "period_start": 1708008533,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -654,7 +654,7 @@
           "statement_descriptor": "Zulip Basic",
           "status": "open",
           "status_transitions": {
-            "finalized_at": 1708008534,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
             "paid_at": null,
             "voided_at": null
@@ -672,7 +672,7 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": 1708008534
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -692,19 +692,19 @@
           }
         }
       },
-      "id": "evt_1Ok6F9DEQaroqDjs0rdLQekD",
+      "id": "evt_1OqSpODEQaroqDjs0Ai7DtRD",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_cqaAW920i6zF2h",
-        "idempotency_key": "d67722fa-2db8-4b94-b2d9-b98eaa501d38"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "a1abf638-7259-4f7c-97a8-cfb835679061"
       },
       "type": "invoice.updated"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008534,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": 10000,
@@ -724,16 +724,16 @@
             "has_more": false,
             "object": "list",
             "total_count": 0,
-            "url": "/v1/charges?payment_intent=pi_3Ok6F8DEQaroqDjs1alKvD7i"
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_3Ok6F8DEQaroqDjs1alKvD7i_secret_FZ8ygIrElKjBNSpvPDw0ha4CZ",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_HGrreySJxfvWNq35niC40cN10",
           "confirmation_method": "automatic",
-          "created": 1708008534,
+          "created": 1000000000,
           "currency": "usd",
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
-          "id": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
-          "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
           "last_payment_error": null,
           "latest_charge": null,
           "livemode": false,
@@ -769,19 +769,19 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ok6F8DEQaroqDjs1KJrwQrH",
+      "id": "evt_3OqSpNDEQaroqDjs016i30na",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_cqaAW920i6zF2h",
-        "idempotency_key": "d67722fa-2db8-4b94-b2d9-b98eaa501d38"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "a1abf638-7259-4f7c-97a8-cfb835679061"
       },
       "type": "payment_intent.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008534,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -804,10 +804,10 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1708008533,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -827,7 +827,7 @@
           "footer": null,
           "from_invoice": null,
           "hosted_invoice_url": null,
-          "id": "in_1Ok6F7DEQaroqDjslOe91xON",
+          "id": "in_NORMALIZED00000000000001",
           "invoice_pdf": null,
           "issuer": {
             "type": "self"
@@ -844,30 +844,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-                "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-                "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708008533,
-                  "start": 1708008533
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1706114464,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -891,7 +891,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -912,8 +912,8 @@
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708008533,
-          "period_start": 1708008533,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -949,54 +949,54 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ok6F8DEQaroqDjsg2dOKiij",
+      "id": "evt_1OqSpNDEQaroqDjsv6G4xbET",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_bJb4CKGTE9X5e3",
-        "idempotency_key": "eb13bd62-3050-4192-ac96-284ef6890134"
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "bae9683c-5731-46be-a732-b09d19038029"
       },
       "type": "invoice.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008533,
+      "created": 1000000000,
       "data": {
         "object": {
           "amount": 10000,
           "currency": "usd",
-          "customer": "cus_PZEia820z9Zo16",
-          "date": 1708008533,
+          "customer": "cus_NORMALIZED0001",
+          "date": 1000000000,
           "description": "Zulip Basic",
           "discountable": false,
           "discounts": [],
-          "id": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+          "id": "ii_NORMALIZED00000000000001",
           "invoice": null,
           "livemode": false,
           "metadata": {},
           "object": "invoiceitem",
           "period": {
-            "end": 1708008533,
-            "start": 1708008533
+            "end": 1000000000,
+            "start": 1000000000
           },
           "plan": null,
           "price": {
             "active": false,
             "billing_scheme": "per_unit",
-            "created": 1706114464,
+            "created": 1000000000,
             "currency": "usd",
             "custom_unit_amount": null,
-            "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+            "id": "price_NORMALIZED00000000000001",
             "livemode": false,
             "lookup_key": null,
             "metadata": {},
             "nickname": null,
             "object": "price",
-            "product": "prod_PDUwJ9ZgTQzjad",
+            "product": "prod_NORMALIZED0001",
             "recurring": null,
             "tax_behavior": "unspecified",
             "tiers_mode": null,
@@ -1014,43 +1014,43 @@
           "unit_amount_decimal": "10000"
         }
       },
-      "id": "evt_1Ok6F7DEQaroqDjsZLTTK10x",
+      "id": "evt_1OqSpMDEQaroqDjsfFCJpAtE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_Oy54RCH9j52o50",
-        "idempotency_key": "1812e364-61c9-4918-9f6f-bfccff47b17f"
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "52cf8b0c-e224-4990-a19e-e167b341068f"
       },
       "type": "invoiceitem.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008533,
+      "created": 1000000000,
       "data": {
         "object": {
           "address": null,
           "balance": 0,
-          "created": 1708008524,
+          "created": 1000000000,
           "currency": "usd",
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver f267ada0-3e8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
-          "id": "cus_PZEia820z9Zo16",
-          "invoice_prefix": "4B9E7A40",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+            "default_payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "f267ada0-3e8e-4c92-991d-5715db017e75"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1066,13 +1066,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1Ok6F7DEQaroqDjsg6OEkK0V",
+      "id": "evt_1OqSpMDEQaroqDjsBPe8W7a4",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_Oy54RCH9j52o50",
-        "idempotency_key": "1812e364-61c9-4918-9f6f-bfccff47b17f"
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "52cf8b0c-e224-4990-a19e-e167b341068f"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.3.json
index 6ab8b29bc8..e3544a6235 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.3.json
@@ -2,7 +2,7 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1708008536,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -23,12 +23,12 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_3Ok6F8DEQaroqDjs177d5Sdi",
+          "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1708008533,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -43,13 +43,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708008534,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM3020040tGIsYh?s=ap",
-          "id": "in_1Ok6F7DEQaroqDjslOe91xON",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM3020040tGIsYh/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjEyMA02008DUMYuxS?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjEyMA02008DUMYuxS/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -65,30 +65,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-                "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-                "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708008533,
-                  "start": 1708008533
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1706114464,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -112,7 +112,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -122,19 +122,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "4B9E7A40-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708008533,
-          "period_start": 1708008533,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -152,9 +152,9 @@
           "statement_descriptor": "Zulip Basic",
           "status": "paid",
           "status_transitions": {
-            "finalized_at": 1708008534,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
-            "paid_at": 1708008535,
+            "paid_at": 1000000000,
             "voided_at": null
           },
           "subscription": null,
@@ -170,22 +170,22 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": 1708008534
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ok6FBDEQaroqDjsfrJltxrW",
+      "id": "evt_1OqSpQDEQaroqDjsaiV4JOB7",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_5NAIOMLpXXEH9L",
-        "idempotency_key": "6368f02d-e32c-4037-9d6b-d9fb092f5ee5"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bf61dbdc-c1eb-4734-aef8-e7822b796eaf"
       },
       "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008536,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -206,12 +206,12 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_3Ok6F8DEQaroqDjs177d5Sdi",
+          "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1708008533,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -226,13 +226,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708008534,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM3020040tGIsYh?s=ap",
-          "id": "in_1Ok6F7DEQaroqDjslOe91xON",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM3020040tGIsYh/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjEyMA02008DUMYuxS?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjEyMA02008DUMYuxS/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -248,30 +248,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-                "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-                "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708008533,
-                  "start": 1708008533
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1706114464,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -295,7 +295,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -305,19 +305,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "4B9E7A40-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708008533,
-          "period_start": 1708008533,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -335,9 +335,9 @@
           "statement_descriptor": "Zulip Basic",
           "status": "paid",
           "status_transitions": {
-            "finalized_at": 1708008534,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
-            "paid_at": 1708008535,
+            "paid_at": 1000000000,
             "voided_at": null
           },
           "subscription": null,
@@ -353,22 +353,22 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": 1708008534
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ok6FBDEQaroqDjs3ywvu0ze",
+      "id": "evt_1OqSpQDEQaroqDjs45ZD0uRY",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_5NAIOMLpXXEH9L",
-        "idempotency_key": "6368f02d-e32c-4037-9d6b-d9fb092f5ee5"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bf61dbdc-c1eb-4734-aef8-e7822b796eaf"
       },
       "type": "invoice.paid"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1708008536,
+      "created": 1000000000,
       "data": {
         "object": {
           "account_country": "US",
@@ -389,12 +389,12 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_3Ok6F8DEQaroqDjs177d5Sdi",
+          "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1708008533,
+          "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
-          "customer": "cus_PZEia820z9Zo16",
+          "customer": "cus_NORMALIZED0001",
           "customer_address": null,
           "customer_email": "hamlet@zulip.com",
           "customer_name": null,
@@ -409,13 +409,13 @@
           "discount": null,
           "discounts": [],
           "due_date": null,
-          "effective_at": 1708008534,
+          "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM3020040tGIsYh?s=ap",
-          "id": "in_1Ok6F7DEQaroqDjslOe91xON",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM3020040tGIsYh/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjEyMA02008DUMYuxS?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjEyMA02008DUMYuxS/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -431,30 +431,30 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-                "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-                "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
                 "period": {
-                  "end": 1708008533,
-                  "start": 1708008533
+                  "end": 1000000000,
+                  "start": 1000000000
                 },
                 "plan": null,
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1706114464,
+                  "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_PDUwJ9ZgTQzjad",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -478,7 +478,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -488,19 +488,19 @@
             "plan_tier": "103"
           },
           "next_payment_attempt": null,
-          "number": "4B9E7A40-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
             "payment_method_types": null
           },
-          "period_end": 1708008533,
-          "period_start": 1708008533,
+          "period_end": 1000000000,
+          "period_start": 1000000000,
           "post_payment_credit_notes_amount": 0,
           "pre_payment_credit_notes_amount": 0,
           "quote": null,
@@ -518,9 +518,9 @@
           "statement_descriptor": "Zulip Basic",
           "status": "paid",
           "status_transitions": {
-            "finalized_at": 1708008534,
+            "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
-            "paid_at": 1708008535,
+            "paid_at": 1000000000,
             "voided_at": null
           },
           "subscription": null,
@@ -536,7 +536,7 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": 1708008534
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -551,13 +551,13 @@
           }
         }
       },
-      "id": "evt_1Ok6FBDEQaroqDjsHTkMhuv8",
+      "id": "evt_1OqSpQDEQaroqDjsQBR56f8K",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_5NAIOMLpXXEH9L",
-        "idempotency_key": "6368f02d-e32c-4037-9d6b-d9fb092f5ee5"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bf61dbdc-c1eb-4734-aef8-e7822b796eaf"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.1.json
index fb372cc999..83339f0557 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.1.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008533,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6F7DEQaroqDjslOe91xON",
+  "id": "in_NORMALIZED00000000000001",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,30 +59,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-        "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-        "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708008533,
-          "start": 1708008533
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1706114464,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PDUwJ9ZgTQzjad",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,7 +106,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
@@ -127,8 +127,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008533,
-  "period_start": 1708008533,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -164,5 +164,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.10.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.10.json
index a98c7ba9e3..98f59ac10b 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.10.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.10.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008556,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FUDEQaroqDjsXHkqSdRn",
+  "id": "in_NORMALIZED00000000000002",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FTDEQaroqDjsC0czKUmL",
-        "invoice": "in_1Ok6FUDEQaroqDjsXHkqSdRn",
-        "invoice_item": "ii_1Ok6FTDEQaroqDjs4iYz8E5l",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FUDEQaroqDjsXHkqSdRn/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012156,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008556,
-  "period_start": 1708008556,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.11.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.11.json
index a747eb63d2..8807aa841d 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.11.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.11.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008558,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FWDEQaroqDjsJ19FPr2z",
+  "id": "in_NORMALIZED00000000000003",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FVDEQaroqDjsU0vwtWFA",
-        "invoice": "in_1Ok6FWDEQaroqDjsJ19FPr2z",
-        "invoice_item": "ii_1Ok6FVDEQaroqDjsF610cGBM",
+        "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
+        "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FWDEQaroqDjsJ19FPr2z/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000003/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012158,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008558,
-  "period_start": 1708008558,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.12.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.12.json
index cf4ca25f3d..4cecf5a40d 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.12.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.12.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008560,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FYDEQaroqDjsEpZnXYMn",
+  "id": "in_NORMALIZED00000000000004",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FXDEQaroqDjsAwIlpkZG",
-        "invoice": "in_1Ok6FYDEQaroqDjsEpZnXYMn",
-        "invoice_item": "ii_1Ok6FXDEQaroqDjstkBNGP1P",
+        "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000004",
+        "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FYDEQaroqDjsEpZnXYMn/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012160,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008560,
-  "period_start": 1708008560,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.13.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.13.json
index 55464796b6..1f1a801300 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.13.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.13.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008562,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FaDEQaroqDjsU4FjJIJF",
+  "id": "in_NORMALIZED00000000000005",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FZDEQaroqDjsb3vqKZkB",
-        "invoice": "in_1Ok6FaDEQaroqDjsU4FjJIJF",
-        "invoice_item": "ii_1Ok6FZDEQaroqDjsrVeibhC4",
+        "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000005",
+        "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708008561,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok6FZDEQaroqDjslmbiQTS8",
+          "id": "price_NORMALIZED00000000000003",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FaDEQaroqDjsU4FjJIJF/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000005/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012162,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008562,
-  "period_start": 1708008562,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 14166,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.2.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.2.json
index 488cef05bb..186e4d7352 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.2.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008539,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FDDEQaroqDjsOmsu3UGH",
+  "id": "in_NORMALIZED00000000000006",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FDDEQaroqDjsqcURxFCm",
-        "invoice": "in_1Ok6FDDEQaroqDjsOmsu3UGH",
-        "invoice_item": "ii_1Ok6FDDEQaroqDjsobmrF8r5",
+        "id": "il_NORMALIZED00000000000006",
+        "invoice": "in_NORMALIZED00000000000006",
+        "invoice_item": "ii_NORMALIZED00000000000006",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FDDEQaroqDjsOmsu3UGH/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000006/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012139,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008539,
-  "period_start": 1708008539,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.3.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.3.json
index ecbafd2b75..c68f94a1f9 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.3.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008541,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FFDEQaroqDjsLt19vWWG",
+  "id": "in_NORMALIZED00000000000007",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FFDEQaroqDjsokI1EFt8",
-        "invoice": "in_1Ok6FFDEQaroqDjsLt19vWWG",
-        "invoice_item": "ii_1Ok6FFDEQaroqDjs5Ax5K3un",
+        "id": "il_NORMALIZED00000000000007",
+        "invoice": "in_NORMALIZED00000000000007",
+        "invoice_item": "ii_NORMALIZED00000000000007",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FFDEQaroqDjsLt19vWWG/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000007/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012141,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008541,
-  "period_start": 1708008541,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.4.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.4.json
index 4e9ce8971b..40c88212ab 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.4.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008543,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FHDEQaroqDjsjETDjm3N",
+  "id": "in_NORMALIZED00000000000008",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FHDEQaroqDjsuaJsHLX7",
-        "invoice": "in_1Ok6FHDEQaroqDjsjETDjm3N",
-        "invoice_item": "ii_1Ok6FHDEQaroqDjsYbai5bKM",
+        "id": "il_NORMALIZED00000000000008",
+        "invoice": "in_NORMALIZED00000000000008",
+        "invoice_item": "ii_NORMALIZED00000000000008",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FHDEQaroqDjsjETDjm3N/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000008/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012143,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008543,
-  "period_start": 1708008543,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.5.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.5.json
index a23b2b203a..07d5da1079 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.5.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.5.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008545,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FJDEQaroqDjsr5vNb1mu",
+  "id": "in_NORMALIZED00000000000009",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FJDEQaroqDjsbuUtMsbz",
-        "invoice": "in_1Ok6FJDEQaroqDjsr5vNb1mu",
-        "invoice_item": "ii_1Ok6FJDEQaroqDjsYiAZ5f7J",
+        "id": "il_NORMALIZED00000000000009",
+        "invoice": "in_NORMALIZED00000000000009",
+        "invoice_item": "ii_NORMALIZED00000000000009",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FJDEQaroqDjsr5vNb1mu/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000009/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012145,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008545,
-  "period_start": 1708008545,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.6.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.6.json
index da25f5b0e7..e58c47233c 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.6.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.6.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008547,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FLDEQaroqDjscwwAP1gG",
+  "id": "in_NORMALIZED00000000000010",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FLDEQaroqDjsMtJKF1V2",
-        "invoice": "in_1Ok6FLDEQaroqDjscwwAP1gG",
-        "invoice_item": "ii_1Ok6FLDEQaroqDjsJ8fkxeT2",
+        "id": "il_NORMALIZED00000000000010",
+        "invoice": "in_NORMALIZED00000000000010",
+        "invoice_item": "ii_NORMALIZED00000000000010",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FLDEQaroqDjscwwAP1gG/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000010/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012147,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008547,
-  "period_start": 1708008547,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.7.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.7.json
index 5661602fd1..10cdff0410 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.7.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.7.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008550,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FODEQaroqDjsxAen1rCO",
+  "id": "in_NORMALIZED00000000000011",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FNDEQaroqDjsj9Abe5vE",
-        "invoice": "in_1Ok6FODEQaroqDjsxAen1rCO",
-        "invoice_item": "ii_1Ok6FNDEQaroqDjsqzHmAwmk",
+        "id": "il_NORMALIZED00000000000011",
+        "invoice": "in_NORMALIZED00000000000011",
+        "invoice_item": "ii_NORMALIZED00000000000011",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FODEQaroqDjsxAen1rCO/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000011/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012150,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008550,
-  "period_start": 1708008550,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.8.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.8.json
index 913c7957a3..44313f36e7 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.8.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.8.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008552,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FQDEQaroqDjskVWg8EKf",
+  "id": "in_NORMALIZED00000000000012",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FPDEQaroqDjsFiW413HO",
-        "invoice": "in_1Ok6FQDEQaroqDjskVWg8EKf",
-        "invoice_item": "ii_1Ok6FPDEQaroqDjsgUXTYMsr",
+        "id": "il_NORMALIZED00000000000012",
+        "invoice": "in_NORMALIZED00000000000012",
+        "invoice_item": "ii_NORMALIZED00000000000012",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FQDEQaroqDjskVWg8EKf/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000012/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012152,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008552,
-  "period_start": 1708008552,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.9.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.9.json
index e4c3f619f1..eda62614e3 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.9.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.9.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008553,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_1Ok6FSDEQaroqDjselZMgjkA",
+  "id": "in_NORMALIZED00000000000013",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FRDEQaroqDjs9qv4Oyjo",
-        "invoice": "in_1Ok6FSDEQaroqDjselZMgjkA",
-        "invoice_item": "ii_1Ok6FRDEQaroqDjsxxNJcAA3",
+        "id": "il_NORMALIZED00000000000013",
+        "invoice": "in_NORMALIZED00000000000013",
+        "invoice_item": "ii_NORMALIZED00000000000013",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,11 +106,11 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FSDEQaroqDjselZMgjkA/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000013/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012153,
+  "next_payment_attempt": 1000000000,
   "number": null,
   "object": "invoice",
   "on_behalf_of": null,
@@ -122,8 +122,8 @@
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008553,
-  "period_start": 1708008553,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.1.json
index d537de05a7..a626a10f00 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.1.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008533,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008534,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM00200r2lvslrL?s=ap",
-  "id": "in_1Ok6F7DEQaroqDjslOe91xON",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM00200r2lvslrL/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOA0200DVfwPgbh?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOA0200DVfwPgbh/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,30 +59,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-        "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-        "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708008533,
-          "start": 1708008533
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1706114464,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PDUwJ9ZgTQzjad",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,7 +106,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
@@ -116,19 +116,19 @@
     "plan_tier": "103"
   },
   "next_payment_attempt": null,
-  "number": "4B9E7A40-0001",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
+  "payment_intent": "pi_NORMALIZED00000000000001",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008533,
-  "period_start": 1708008533,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -146,7 +146,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008534,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -164,5 +164,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008534
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.10.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.10.json
index 3403952938..dd503a8254 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.10.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.10.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008556,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008556,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpR0M2TUMxVkNmbXI1ZmJqRWRIVmxqZXNBQkFzLDk4NTQ5MzU30200aoiW5hr5?s=ap",
-  "id": "in_1Ok6FUDEQaroqDjsXHkqSdRn",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpR0M2TUMxVkNmbXI1ZmJqRWRIVmxqZXNBQkFzLDk4NTQ5MzU30200aoiW5hr5/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TVWVBb0w0SkFscHo5a0duRTNBQkpYT3pxOTU4LDEwMDA2NjEzNg0200vQgMiTCM?s=ap",
+  "id": "in_NORMALIZED00000000000002",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TVWVBb0w0SkFscHo5a0duRTNBQkpYT3pxOTU4LDEwMDA2NjEzNg0200vQgMiTCM/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FTDEQaroqDjsC0czKUmL",
-        "invoice": "in_1Ok6FUDEQaroqDjsXHkqSdRn",
-        "invoice_item": "ii_1Ok6FTDEQaroqDjs4iYz8E5l",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FUDEQaroqDjsXHkqSdRn/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012156,
-  "number": "4B9E7A40-0010",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FUDEQaroqDjs0Qh3LAW4",
+  "payment_intent": "pi_NORMALIZED00000000000002",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008556,
-  "period_start": 1708008556,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008556,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008556
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.11.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.11.json
index 122319e7a7..6304901908 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.11.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.11.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008558,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008558,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpWjBVZEdGdUIxSWdkaG82VUJtaUtOQVFBM1RNLDk4NTQ5MzU50200L46Pn7da?s=ap",
-  "id": "in_1Ok6FWDEQaroqDjsJ19FPr2z",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpWjBVZEdGdUIxSWdkaG82VUJtaUtOQVFBM1RNLDk4NTQ5MzU50200L46Pn7da/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TQTNBcFFoUVljNURvZVRIVGVEamV1RmZwcVJ3LDEwMDA2NjEzOA0200T8GkRMl6?s=ap",
+  "id": "in_NORMALIZED00000000000003",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TQTNBcFFoUVljNURvZVRIVGVEamV1RmZwcVJ3LDEwMDA2NjEzOA0200T8GkRMl6/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FVDEQaroqDjsU0vwtWFA",
-        "invoice": "in_1Ok6FWDEQaroqDjsJ19FPr2z",
-        "invoice_item": "ii_1Ok6FVDEQaroqDjsF610cGBM",
+        "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
+        "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FWDEQaroqDjsJ19FPr2z/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000003/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012158,
-  "number": "4B9E7A40-0011",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0004",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FWDEQaroqDjs0OcdvUja",
+  "payment_intent": "pi_NORMALIZED00000000000003",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008558,
-  "period_start": 1708008558,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008558,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008558
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.12.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.12.json
index 8f1f0b17cd..285828ee91 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.12.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.12.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008560,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008560,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVqQlY3TFY1NXhWZFlhVlE4Rzk5bVlSVnZIcFZ3LDk4NTQ5MzYx0200k3EUVlU7?s=ap",
-  "id": "in_1Ok6FYDEQaroqDjsEpZnXYMn",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVqQlY3TFY1NXhWZFlhVlE4Rzk5bVlSVnZIcFZ3LDk4NTQ5MzYx0200k3EUVlU7/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TYlEwNjRhS3lLYTIybWs2akhIRkxuQThNWGdaLDEwMDA2NjE0MA0200anUzrRcR?s=ap",
+  "id": "in_NORMALIZED00000000000004",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TYlEwNjRhS3lLYTIybWs2akhIRkxuQThNWGdaLDEwMDA2NjE0MA0200anUzrRcR/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FXDEQaroqDjsAwIlpkZG",
-        "invoice": "in_1Ok6FYDEQaroqDjsEpZnXYMn",
-        "invoice_item": "ii_1Ok6FXDEQaroqDjstkBNGP1P",
+        "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000004",
+        "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FYDEQaroqDjsEpZnXYMn/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012160,
-  "number": "4B9E7A40-0012",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0005",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FZDEQaroqDjs0j5VNR6m",
+  "payment_intent": "pi_NORMALIZED00000000000004",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008560,
-  "period_start": 1708008560,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008560,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.13.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.13.json
index 1d483b575b..3e26cbc25a 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.13.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.13.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008562,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008562,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVqVlBndDJYa0NBTHlTS0VnWWxSaEdoc2daNGx3LDk4NTQ5MzYz0200r1LSAzXG?s=ap",
-  "id": "in_1Ok6FaDEQaroqDjsU4FjJIJF",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVqVlBndDJYa0NBTHlTS0VnWWxSaEdoc2daNGx3LDk4NTQ5MzYz0200r1LSAzXG/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TQU9tQm1ieWJQNlljcjNJbUpvQUZpVTNKa0phLDEwMDA2NjE0Mg0200g3s592tf?s=ap",
+  "id": "in_NORMALIZED00000000000005",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TQU9tQm1ieWJQNlljcjNJbUpvQUZpVTNKa0phLDEwMDA2NjE0Mg0200g3s592tf/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FZDEQaroqDjsb3vqKZkB",
-        "invoice": "in_1Ok6FaDEQaroqDjsU4FjJIJF",
-        "invoice_item": "ii_1Ok6FZDEQaroqDjsrVeibhC4",
+        "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000005",
+        "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708008561,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok6FZDEQaroqDjslmbiQTS8",
+          "id": "price_NORMALIZED00000000000003",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FaDEQaroqDjsU4FjJIJF/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000005/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012162,
-  "number": "4B9E7A40-0013",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0006",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FbDEQaroqDjs1jcH5DKT",
+  "payment_intent": "pi_NORMALIZED00000000000005",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008562,
-  "period_start": 1708008562,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008562,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 14166,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008562
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.2.json
index 2d33d0244c..d0ba019e11 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.2.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008539,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008540,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpdGJUUzY4MjQ4UXk2Y0oxQjMweDBrQXBWbnMxLDk4NTQ5MzQw0200NgBRRnsC?s=ap",
-  "id": "in_1Ok6FDDEQaroqDjsOmsu3UGH",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpdGJUUzY4MjQ4UXk2Y0oxQjMweDBrQXBWbnMxLDk4NTQ5MzQw0200NgBRRnsC/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TUXZFS0ZnYUhCaVRXd1JhN1pDajBBdmxxemR0LDEwMDA2NjEyMg0200RfttaVC5?s=ap",
+  "id": "in_NORMALIZED00000000000006",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TUXZFS0ZnYUhCaVRXd1JhN1pDajBBdmxxemR0LDEwMDA2NjEyMg0200RfttaVC5/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FDDEQaroqDjsqcURxFCm",
-        "invoice": "in_1Ok6FDDEQaroqDjsOmsu3UGH",
-        "invoice_item": "ii_1Ok6FDDEQaroqDjsobmrF8r5",
+        "id": "il_NORMALIZED00000000000006",
+        "invoice": "in_NORMALIZED00000000000006",
+        "invoice_item": "ii_NORMALIZED00000000000006",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FDDEQaroqDjsOmsu3UGH/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000006/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012139,
-  "number": "4B9E7A40-0002",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0007",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FEDEQaroqDjs0sbrBvag",
+  "payment_intent": "pi_NORMALIZED00000000000006",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008539,
-  "period_start": 1708008539,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008540,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008540
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.3.json
index 680be56d64..f80cebd748 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.3.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008541,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008542,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpTWhvTzFRT3JxNjRKSWdTZVF3bmt1aWY1VG5TLDk4NTQ5MzQy02008gR99B0O?s=ap",
-  "id": "in_1Ok6FFDEQaroqDjsLt19vWWG",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpTWhvTzFRT3JxNjRKSWdTZVF3bmt1aWY1VG5TLDk4NTQ5MzQy02008gR99B0O/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TNlpBWmhzSE9KZmxMWk5uUnRDU2ZkUm04a24yLDEwMDA2NjEyNA0200lhFlk5h0?s=ap",
+  "id": "in_NORMALIZED00000000000007",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TNlpBWmhzSE9KZmxMWk5uUnRDU2ZkUm04a24yLDEwMDA2NjEyNA0200lhFlk5h0/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FFDEQaroqDjsokI1EFt8",
-        "invoice": "in_1Ok6FFDEQaroqDjsLt19vWWG",
-        "invoice_item": "ii_1Ok6FFDEQaroqDjs5Ax5K3un",
+        "id": "il_NORMALIZED00000000000007",
+        "invoice": "in_NORMALIZED00000000000007",
+        "invoice_item": "ii_NORMALIZED00000000000007",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FFDEQaroqDjsLt19vWWG/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000007/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012141,
-  "number": "4B9E7A40-0003",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0008",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FGDEQaroqDjs1IMocKEu",
+  "payment_intent": "pi_NORMALIZED00000000000007",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008541,
-  "period_start": 1708008541,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008542,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008542
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.4.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.4.json
index cd51b6d524..abcea04f8d 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.4.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008543,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008544,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpbUtENVk2eUozNHhmdHFoU3N4Wk1yNzB5VEVGLDk4NTQ5MzQ10200u6IcYseW?s=ap",
-  "id": "in_1Ok6FHDEQaroqDjsjETDjm3N",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpbUtENVk2eUozNHhmdHFoU3N4Wk1yNzB5VEVGLDk4NTQ5MzQ10200u6IcYseW/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TSE9ZdXF5MTZ5TUl6ajEyakRUWDhUMUk0SFYxLDEwMDA2NjEyNg0200b96HKHMs?s=ap",
+  "id": "in_NORMALIZED00000000000008",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TSE9ZdXF5MTZ5TUl6ajEyakRUWDhUMUk0SFYxLDEwMDA2NjEyNg0200b96HKHMs/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FHDEQaroqDjsuaJsHLX7",
-        "invoice": "in_1Ok6FHDEQaroqDjsjETDjm3N",
-        "invoice_item": "ii_1Ok6FHDEQaroqDjsYbai5bKM",
+        "id": "il_NORMALIZED00000000000008",
+        "invoice": "in_NORMALIZED00000000000008",
+        "invoice_item": "ii_NORMALIZED00000000000008",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FHDEQaroqDjsjETDjm3N/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000008/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012143,
-  "number": "4B9E7A40-0004",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0009",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FIDEQaroqDjs01eAMKm1",
+  "payment_intent": "pi_NORMALIZED00000000000008",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008543,
-  "period_start": 1708008543,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008544,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008544
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.5.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.5.json
index c151339fbe..48113465b9 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.5.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.5.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008545,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008546,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpbkVIQnJJMGhYU1VnRHJpdW5lWnNiZmVLU1BYLDk4NTQ5MzQ20200MiwnYrzs?s=ap",
-  "id": "in_1Ok6FJDEQaroqDjsr5vNb1mu",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpbkVIQnJJMGhYU1VnRHJpdW5lWnNiZmVLU1BYLDk4NTQ5MzQ20200MiwnYrzs/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TZUEwaXZKYVVyVnRGTlpnbjdCVE4wekNSUnVzLDEwMDA2NjEyNw020034plRXAO?s=ap",
+  "id": "in_NORMALIZED00000000000009",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TZUEwaXZKYVVyVnRGTlpnbjdCVE4wekNSUnVzLDEwMDA2NjEyNw020034plRXAO/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FJDEQaroqDjsbuUtMsbz",
-        "invoice": "in_1Ok6FJDEQaroqDjsr5vNb1mu",
-        "invoice_item": "ii_1Ok6FJDEQaroqDjsYiAZ5f7J",
+        "id": "il_NORMALIZED00000000000009",
+        "invoice": "in_NORMALIZED00000000000009",
+        "invoice_item": "ii_NORMALIZED00000000000009",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FJDEQaroqDjsr5vNb1mu/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000009/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012145,
-  "number": "4B9E7A40-0005",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0010",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FKDEQaroqDjs0hpVrdOE",
+  "payment_intent": "pi_NORMALIZED00000000000009",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008545,
-  "period_start": 1708008545,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008546,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008546
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.6.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.6.json
index 8722d4eb4a..0349300d5c 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.6.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.6.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008547,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008548,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpbERXRzJYdUpRZjA5TVgzOWVrdUc4U241YTVDLDk4NTQ5MzQ50200mfjotCWj?s=ap",
-  "id": "in_1Ok6FLDEQaroqDjscwwAP1gG",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpbERXRzJYdUpRZjA5TVgzOWVrdUc4U241YTVDLDk4NTQ5MzQ50200mfjotCWj/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TOExwMWhMZHNaaE9BVUJVU1VIaFUzYzEyc0xDLDEwMDA2NjEyOQ020020mSSN0k?s=ap",
+  "id": "in_NORMALIZED00000000000010",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TOExwMWhMZHNaaE9BVUJVU1VIaFUzYzEyc0xDLDEwMDA2NjEyOQ020020mSSN0k/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FLDEQaroqDjsMtJKF1V2",
-        "invoice": "in_1Ok6FLDEQaroqDjscwwAP1gG",
-        "invoice_item": "ii_1Ok6FLDEQaroqDjsJ8fkxeT2",
+        "id": "il_NORMALIZED00000000000010",
+        "invoice": "in_NORMALIZED00000000000010",
+        "invoice_item": "ii_NORMALIZED00000000000010",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FLDEQaroqDjscwwAP1gG/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000010/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012147,
-  "number": "4B9E7A40-0006",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0011",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FMDEQaroqDjs0dDWCYyW",
+  "payment_intent": "pi_NORMALIZED00000000000010",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008547,
-  "period_start": 1708008547,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008548,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008548
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.7.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.7.json
index c16325beb6..040ee2a25f 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.7.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.7.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008550,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008550,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpWTh0bnJ3eUR5UlE2eUdLMlRjaFJxcXVPazVqLDk4NTQ5MzUx0200PwkNuVho?s=ap",
-  "id": "in_1Ok6FODEQaroqDjsxAen1rCO",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpWTh0bnJ3eUR5UlE2eUdLMlRjaFJxcXVPazVqLDk4NTQ5MzUx0200PwkNuVho/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TRE04d0lpdTJEQzV5QWVnamVmQjhYN3ZLTVlFLDEwMDA2NjEzMQ02004jF1VAN0?s=ap",
+  "id": "in_NORMALIZED00000000000011",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TRE04d0lpdTJEQzV5QWVnamVmQjhYN3ZLTVlFLDEwMDA2NjEzMQ02004jF1VAN0/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FNDEQaroqDjsj9Abe5vE",
-        "invoice": "in_1Ok6FODEQaroqDjsxAen1rCO",
-        "invoice_item": "ii_1Ok6FNDEQaroqDjsqzHmAwmk",
+        "id": "il_NORMALIZED00000000000011",
+        "invoice": "in_NORMALIZED00000000000011",
+        "invoice_item": "ii_NORMALIZED00000000000011",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FODEQaroqDjsxAen1rCO/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000011/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012150,
-  "number": "4B9E7A40-0007",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0012",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FODEQaroqDjs1VTeTMsX",
+  "payment_intent": "pi_NORMALIZED00000000000011",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008550,
-  "period_start": 1708008550,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008550,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008550
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.8.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.8.json
index 1a768606c0..3ecc8de406 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.8.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.8.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008552,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008552,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpajNvTmUzSEoyS2ZnUkd2eE00SmI0bGVXOThMLDk4NTQ5MzUz0200r8xKedk1?s=ap",
-  "id": "in_1Ok6FQDEQaroqDjskVWg8EKf",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpajNvTmUzSEoyS2ZnUkd2eE00SmI0bGVXOThMLDk4NTQ5MzUz0200r8xKedk1/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TQjFSOE1IdDNQVzF6SjBuMnZNdm1yQjZodDc4LDEwMDA2NjEzMg0200a7Mv7r0x?s=ap",
+  "id": "in_NORMALIZED00000000000012",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TQjFSOE1IdDNQVzF6SjBuMnZNdm1yQjZodDc4LDEwMDA2NjEzMg0200a7Mv7r0x/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FPDEQaroqDjsFiW413HO",
-        "invoice": "in_1Ok6FQDEQaroqDjskVWg8EKf",
-        "invoice_item": "ii_1Ok6FPDEQaroqDjsgUXTYMsr",
+        "id": "il_NORMALIZED00000000000012",
+        "invoice": "in_NORMALIZED00000000000012",
+        "invoice_item": "ii_NORMALIZED00000000000012",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FQDEQaroqDjskVWg8EKf/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000012/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012152,
-  "number": "4B9E7A40-0008",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0013",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FQDEQaroqDjs1eOoiRWG",
+  "payment_intent": "pi_NORMALIZED00000000000012",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008552,
-  "period_start": 1708008552,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008552,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.9.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.9.json
index 39266a3d61..0882be9799 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.9.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.9.json
@@ -19,10 +19,10 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1708008553,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008554,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpY21adGt2ZGFTTHpQOVg2ZzNqS3Z2dGhTRjcwLDk4NTQ5MzU00200T6sNXxOh?s=ap",
-  "id": "in_1Ok6FSDEQaroqDjselZMgjkA",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpY21adGt2ZGFTTHpQOVg2ZzNqS3Z2dGhTRjcwLDk4NTQ5MzU00200T6sNXxOh/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TajBSMEQwVWpKZDlDdHJmVEpkMFFJOGp2OXZELDEwMDA2NjEzNA0200bBgdm6ZZ?s=ap",
+  "id": "in_NORMALIZED00000000000013",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TajBSMEQwVWpKZDlDdHJmVEpkMFFJOGp2OXZELDEwMDA2NjEzNA0200bBgdm6ZZ/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,9 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6FRDEQaroqDjs9qv4Oyjo",
-        "invoice": "in_1Ok6FSDEQaroqDjselZMgjkA",
-        "invoice_item": "ii_1Ok6FRDEQaroqDjsxxNJcAA3",
+        "id": "il_NORMALIZED00000000000013",
+        "invoice": "in_NORMALIZED00000000000013",
+        "invoice_item": "ii_NORMALIZED00000000000013",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -73,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1708006262,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PL1wqMUzILAcbD",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,24 +106,24 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6FSDEQaroqDjselZMgjkA/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000013/lines"
   },
   "livemode": false,
   "metadata": {},
-  "next_payment_attempt": 1708012153,
-  "number": "4B9E7A40-0009",
+  "next_payment_attempt": 1000000000,
+  "number": "NORMALI-0014",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6FSDEQaroqDjs1qD1nbd4",
+  "payment_intent": "pi_NORMALIZED00000000000013",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008553,
-  "period_start": 1708008553,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -141,7 +141,7 @@
   "statement_descriptor": "Zulip Basic",
   "status": "open",
   "status_transitions": {
-    "finalized_at": 1708008554,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
     "paid_at": null,
     "voided_at": null
@@ -159,5 +159,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.pay.1.json
index 42a7c2bf9a..745c0c7379 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.pay.1.json
@@ -17,12 +17,12 @@
     "status": null
   },
   "billing_reason": "manual",
-  "charge": "ch_3Ok6F8DEQaroqDjs177d5Sdi",
+  "charge": "ch_NORMALIZED00000000000001",
   "collection_method": "charge_automatically",
-  "created": 1708008533,
+  "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_address": null,
   "customer_email": "hamlet@zulip.com",
   "customer_name": null,
@@ -37,13 +37,13 @@
   "discount": null,
   "discounts": [],
   "due_date": null,
-  "effective_at": 1708008534,
+  "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM20200bsZCZ46O?s=ap",
-  "id": "in_1Ok6F7DEQaroqDjslOe91xON",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_17vTkwDEQaroqDjs/test_YWNjdF8xN3ZUa3dERVFhcm9xRGpzLF9QWkVpRm5DMWQxaEhrZnV6Rnl6OWFLcXFJem5IbVNaLDk4NTQ5MzM20200bsZCZ46O/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOQ0200DrFfC7M5?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ta25VWk5Hc3NKSU10czNpdGdoRzdnZ3NmaEFsLDEwMDA2NjExOQ0200DrFfC7M5/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,30 +59,30 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_1Ok6F7DEQaroqDjs5qpv2Heh",
-        "invoice": "in_1Ok6F7DEQaroqDjslOe91xON",
-        "invoice_item": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
         "period": {
-          "end": 1708008533,
-          "start": 1708008533
+          "end": 1000000000,
+          "start": 1000000000
         },
         "plan": null,
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1706114464,
+          "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_PDUwJ9ZgTQzjad",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -106,7 +106,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_1Ok6F7DEQaroqDjslOe91xON/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
@@ -116,19 +116,19 @@
     "plan_tier": "103"
   },
   "next_payment_attempt": null,
-  "number": "4B9E7A40-0001",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
   "paid_out_of_band": false,
-  "payment_intent": "pi_3Ok6F8DEQaroqDjs1alKvD7i",
+  "payment_intent": "pi_NORMALIZED00000000000001",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
     "payment_method_types": null
   },
-  "period_end": 1708008533,
-  "period_start": 1708008533,
+  "period_end": 1000000000,
+  "period_start": 1000000000,
   "post_payment_credit_notes_amount": 0,
   "pre_payment_credit_notes_amount": 0,
   "quote": null,
@@ -146,9 +146,9 @@
   "statement_descriptor": "Zulip Basic",
   "status": "paid",
   "status_transitions": {
-    "finalized_at": 1708008534,
+    "finalized_at": 1000000000,
     "marked_uncollectible_at": null,
-    "paid_at": 1708008535,
+    "paid_at": 1000000000,
     "voided_at": null
   },
   "subscription": null,
@@ -164,5 +164,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": 1708008534
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.1.json
index 54bf865a2a..26d0241c66 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.1.json
@@ -1,34 +1,34 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008533,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6F7DEQaroqDjs24pAIHvX",
+  "id": "ii_NORMALIZED00000000000001",
   "invoice": null,
   "livemode": false,
   "metadata": {},
   "object": "invoiceitem",
   "period": {
-    "end": 1708008533,
-    "start": 1708008533
+    "end": 1000000000,
+    "start": 1000000000
   },
   "plan": null,
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1706114464,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Oc9VcDEQaroqDjs9z5VJret",
+    "id": "price_NORMALIZED00000000000001",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PDUwJ9ZgTQzjad",
+    "product": "prod_NORMALIZED0001",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.10.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.10.json
index b15c8ca1fc..57e5b85d22 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.10.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.10.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008555,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FTDEQaroqDjs4iYz8E5l",
+  "id": "ii_NORMALIZED00000000000002",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.11.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.11.json
index 954f81b7db..11fb01c661 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.11.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.11.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008557,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FVDEQaroqDjsF610cGBM",
+  "id": "ii_NORMALIZED00000000000003",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.12.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.12.json
index d6c56fad60..c83e802dfd 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.12.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.12.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008559,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FXDEQaroqDjstkBNGP1P",
+  "id": "ii_NORMALIZED00000000000004",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.13.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.13.json
index 7f2e230c85..1a03a4dfb1 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.13.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.13.json
@@ -1,12 +1,12 @@
 {
   "amount": 14166,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008561,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FZDEQaroqDjsrVeibhC4",
+  "id": "ii_NORMALIZED00000000000005",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708008561,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok6FZDEQaroqDjslmbiQTS8",
+    "id": "price_NORMALIZED00000000000003",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.2.json
index 74a74c530a..8d2ac0e9b1 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.2.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008539,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FDDEQaroqDjsobmrF8r5",
+  "id": "ii_NORMALIZED00000000000006",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.3.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.3.json
index d5001395da..8a3237836c 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.3.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008541,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FFDEQaroqDjs5Ax5K3un",
+  "id": "ii_NORMALIZED00000000000007",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.4.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.4.json
index 18b6fea6b1..a5842909a3 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.4.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008543,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FHDEQaroqDjsYbai5bKM",
+  "id": "ii_NORMALIZED00000000000008",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.5.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.5.json
index e45334af0a..cd8d826b59 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.5.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.5.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008545,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FJDEQaroqDjsYiAZ5f7J",
+  "id": "ii_NORMALIZED00000000000009",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.6.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.6.json
index 272e43cadb..c0e3b226b9 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.6.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.6.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008547,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FLDEQaroqDjsJ8fkxeT2",
+  "id": "ii_NORMALIZED00000000000010",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.7.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.7.json
index 5c8e77c403..395f38018f 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.7.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.7.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008549,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FNDEQaroqDjsqzHmAwmk",
+  "id": "ii_NORMALIZED00000000000011",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.8.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.8.json
index f39ca2b396..d513e4c156 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.8.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.8.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008551,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FPDEQaroqDjsgUXTYMsr",
+  "id": "ii_NORMALIZED00000000000012",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.9.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.9.json
index 63d4e1e730..c7edaeab11 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.9.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.9.json
@@ -1,12 +1,12 @@
 {
   "amount": 10000,
   "currency": "usd",
-  "customer": "cus_PZEia820z9Zo16",
-  "date": 1708008553,
+  "customer": "cus_NORMALIZED0001",
+  "date": 1000000000,
   "description": "Zulip Basic - renewal",
   "discountable": false,
   "discounts": [],
-  "id": "ii_1Ok6FRDEQaroqDjsxxNJcAA3",
+  "id": "ii_NORMALIZED00000000000013",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1708006262,
+    "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_1Ok5eUDEQaroqDjshX1NDxnx",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_PL1wqMUzILAcbD",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.create.1.json
index e17d541c0c..3c1b98c0dc 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ok6F2DEQaroqDjsIh4vYZnG_secret_PZEit1aU8ty3GlSdbagzfNCeNKjf4ve",
-  "created": 1708008528,
-  "customer": "cus_PZEia820z9Zo16",
+  "client_secret": "seti_1OqSpIDEQaroqDjs6HEb6QcD_secret_PfoSMSxdL8aN3gccEYoYbnVGmmx7c9N",
+  "created": 1000000000,
+  "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ok6F2DEQaroqDjsIh4vYZnG",
+  "id": "seti_1OqSpIDEQaroqDjs6HEb6QcD",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ok6F2DEQaroqDjsgHikhqvO",
+  "latest_attempt": "setatt_1OqSpIDEQaroqDjsgT70C3Kw",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+  "payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.list.1.json
index cd7100ad02..d1895c11f7 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ok6F1DEQaroqDjsaAnghUo3_secret_PZEivvxKinah2WSKi6xRmJ5gdOASL4f",
-      "created": 1708008527,
-      "customer": "cus_PZEia820z9Zo16",
+      "client_secret": "seti_1OqSpIDEQaroqDjsNkuQet49_secret_PfoSlx5nN103E3oj0ueubU1MrvWQ6mq",
+      "created": 1000000000,
+      "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ok6F1DEQaroqDjsaAnghUo3",
+      "id": "seti_1OqSpIDEQaroqDjsNkuQet49",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.retrieve.1.json
index e17d541c0c..3c1b98c0dc 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ok6F2DEQaroqDjsIh4vYZnG_secret_PZEit1aU8ty3GlSdbagzfNCeNKjf4ve",
-  "created": 1708008528,
-  "customer": "cus_PZEia820z9Zo16",
+  "client_secret": "seti_1OqSpIDEQaroqDjs6HEb6QcD_secret_PfoSMSxdL8aN3gccEYoYbnVGmmx7c9N",
+  "created": 1000000000,
+  "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ok6F2DEQaroqDjsIh4vYZnG",
+  "id": "seti_1OqSpIDEQaroqDjs6HEb6QcD",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ok6F2DEQaroqDjsgHikhqvO",
+  "latest_attempt": "setatt_1OqSpIDEQaroqDjsgT70C3Kw",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ok6F2DEQaroqDjsaS0caoc1",
+  "payment_method": "pm_1OqSpIDEQaroqDjsKCvWmzMh",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.create.1.json
index d974ef5bb6..799c48feb4 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.create.1.json
@@ -9,12 +9,12 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/f267ada0-3e8e-4c92-991d-5715db017e75/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1708008527,
+  "created": 1000000000,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -24,7 +24,7 @@
     "submit": null,
     "terms_of_service_acceptance": null
   },
-  "customer": "cus_PZEia820z9Zo16",
+  "customer": "cus_NORMALIZED0001",
   "customer_creation": null,
   "customer_details": {
     "address": null,
@@ -35,14 +35,14 @@
     "tax_ids": null
   },
   "customer_email": null,
-  "expires_at": 1708094927,
-  "id": "cs_test_c1AW8fEbcPdhctLWfgzkQ41lXw0DdofTO2wFS3ttiE2UqiqJI3B0R0xQ3P",
+  "expires_at": 1000000000,
+  "id": "cs_test_NORMALIZED02ktxbPQVMuNf7b2eCM6N39ZE89DRifuNN7AxEt2k0BGwwVp",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "1",
+    "remote_realm_user_id": "7",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ok6F1DEQaroqDjsaAnghUo3",
+  "setup_intent": "seti_1OqSpIDEQaroqDjsNkuQet49",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/f267ada0-3e8e-4c92-991d-5715db017e75/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_c1AW8fEbcPdhctLWfgzkQ41lXw0DdofTO2wFS3ttiE2UqiqJI3B0R0xQ3P#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02ktxbPQVMuNf7b2eCM6N39ZE89DRifuNN7AxEt2k0BGwwVp#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.list.1.json
index 8e02ead830..bb56940ecd 100644
--- a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.list.1.json
@@ -11,12 +11,12 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/f267ada0-3e8e-4c92-991d-5715db017e75/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1708008527,
+      "created": 1000000000,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -26,7 +26,7 @@
         "submit": null,
         "terms_of_service_acceptance": null
       },
-      "customer": "cus_PZEia820z9Zo16",
+      "customer": "cus_NORMALIZED0001",
       "customer_creation": null,
       "customer_details": {
         "address": null,
@@ -37,14 +37,14 @@
         "tax_ids": null
       },
       "customer_email": null,
-      "expires_at": 1708094927,
-      "id": "cs_test_c1AW8fEbcPdhctLWfgzkQ41lXw0DdofTO2wFS3ttiE2UqiqJI3B0R0xQ3P",
+      "expires_at": 1000000000,
+      "id": "cs_test_NORMALIZED02ktxbPQVMuNf7b2eCM6N39ZE89DRifuNN7AxEt2k0BGwwVp",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "1",
+        "remote_realm_user_id": "7",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ok6F1DEQaroqDjsaAnghUo3",
+      "setup_intent": "seti_1OqSpIDEQaroqDjsNkuQet49",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/f267ada0-3e8e-4c92-991d-5715db017e75/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_c1AW8fEbcPdhctLWfgzkQ41lXw0DdofTO2wFS3ttiE2UqiqJI3B0R0xQ3P#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02ktxbPQVMuNf7b2eCM6N39ZE89DRifuNN7AxEt2k0BGwwVp#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json
index 2ee953049d..ebd8ef7b2b 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohup0DEQaroqDjsrARCBrcr",
+    "default_payment_method": "pm_1OqSppDEQaroqDjs2xJvM4XV",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json
index 2d9317b2cb..4e0c767a84 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup0DEQaroqDjsrARCBrcr",
+      "id": "pm_1OqSppDEQaroqDjs2xJvM4XV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json
index 2d9317b2cb..4e0c767a84 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup0DEQaroqDjsrARCBrcr",
+      "id": "pm_1OqSppDEQaroqDjs2xJvM4XV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json
index 2d9317b2cb..4e0c767a84 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup0DEQaroqDjsrARCBrcr",
+      "id": "pm_1OqSppDEQaroqDjs2xJvM4XV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json
index 2d9317b2cb..4e0c767a84 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup0DEQaroqDjsrARCBrcr",
+      "id": "pm_1OqSppDEQaroqDjs2xJvM4XV",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json
index a8cd1350de..cb28196b1f 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json
index 2ac8fad2a8..737306dd32 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltVFg3NWN2V01kMDB4MDJHalAxV1lVUlp2N3F3LDk4MDI4Nzgw0200Ap6YXuof?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TNjQzbU9yMmxTcU1selhHb0U1SW54N2UwZUdKLDEwMDA2NjE1MA0200mVrNTVe6?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltVFg3NWN2V01kMDB4MDJHalAxV1lVUlp2N3F3LDk4MDI4Nzgw0200Ap6YXuof/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9TNjQzbU9yMmxTcU1selhHb0U1SW54N2UwZUdKLDEwMDA2NjE1MA0200mVrNTVe6/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json
index 7ec73bc85b..5cdc3c19fd 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohup0DEQaroqDjsd1kNMt94_secret_PWymvQBsZdMmiyKgedRJWky0IGFPMfa",
+  "client_secret": "seti_1OqSppDEQaroqDjsFidLPiLa_secret_PfoSygowgug5oKznT0QWp4WhtutvvXh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohup0DEQaroqDjsd1kNMt94",
+  "id": "seti_1OqSppDEQaroqDjsFidLPiLa",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohup1DEQaroqDjsf8DgykMB",
+  "latest_attempt": "setatt_1OqSppDEQaroqDjs5WdGF6B0",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohup0DEQaroqDjsrARCBrcr",
+  "payment_method": "pm_1OqSppDEQaroqDjs2xJvM4XV",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json
index 7bd339625b..6922d76436 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohup0DEQaroqDjsP5bwlS8P_secret_PWymhzl3udn4NKtzoov46LNGwsHuDej",
+      "client_secret": "seti_1OqSpoDEQaroqDjsG2R2Js3a_secret_PfoSVvjboV9TbTwfiP4wdUH18rEup50",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohup0DEQaroqDjsP5bwlS8P",
+      "id": "seti_1OqSpoDEQaroqDjsG2R2Js3a",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json
index 7ec73bc85b..5cdc3c19fd 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohup0DEQaroqDjsd1kNMt94_secret_PWymvQBsZdMmiyKgedRJWky0IGFPMfa",
+  "client_secret": "seti_1OqSppDEQaroqDjsFidLPiLa_secret_PfoSygowgug5oKznT0QWp4WhtutvvXh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohup0DEQaroqDjsd1kNMt94",
+  "id": "seti_1OqSppDEQaroqDjsFidLPiLa",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohup1DEQaroqDjsf8DgykMB",
+  "latest_attempt": "setatt_1OqSppDEQaroqDjs5WdGF6B0",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohup0DEQaroqDjsrARCBrcr",
+  "payment_method": "pm_1OqSppDEQaroqDjs2xJvM4XV",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json
index 4f67420daf..aad197e5fb 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02bvHiRkwvrFQi70Bvwj7XvfKv1Mn3xouAsE8FecYyRifmAu",
+  "id": "cs_test_NORMALIZED02Di868Q68NGD9F3niL2RdV2HDglgaL6m3IkTkqkMmQskPZ3",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohup0DEQaroqDjsP5bwlS8P",
+  "setup_intent": "seti_1OqSpoDEQaroqDjsG2R2Js3a",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02bvHiRkwvrFQi70Bvwj7XvfKv1Mn3xouAsE8FecYyRifmAu#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Di868Q68NGD9F3niL2RdV2HDglgaL6m3IkTkqkMmQskPZ3#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json
index 3743b0970f..daa8179c06 100644
--- a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02bvHiRkwvrFQi70Bvwj7XvfKv1Mn3xouAsE8FecYyRifmAu",
+      "id": "cs_test_NORMALIZED02Di868Q68NGD9F3niL2RdV2HDglgaL6m3IkTkqkMmQskPZ3",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohup0DEQaroqDjsP5bwlS8P",
+      "setup_intent": "seti_1OqSpoDEQaroqDjsG2R2Js3a",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02bvHiRkwvrFQi70Bvwj7XvfKv1Mn3xouAsE8FecYyRifmAu#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Di868Q68NGD9F3niL2RdV2HDglgaL6m3IkTkqkMmQskPZ3#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json
index 6981a75d2d..b46d609b87 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhurGDEQaroqDjsw7GdWGLJ",
+    "default_payment_method": "pm_1OqSsRDEQaroqDjsOwZKBJPf",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json
index 6e207add4a..298047be91 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurGDEQaroqDjsw7GdWGLJ",
+      "id": "pm_1OqSsRDEQaroqDjsOwZKBJPf",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json
index 6e207add4a..298047be91 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurGDEQaroqDjsw7GdWGLJ",
+      "id": "pm_1OqSsRDEQaroqDjsOwZKBJPf",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json
index 6e207add4a..298047be91 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurGDEQaroqDjsw7GdWGLJ",
+      "id": "pm_1OqSsRDEQaroqDjsOwZKBJPf",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json
index 6e207add4a..298047be91 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurGDEQaroqDjsw7GdWGLJ",
+      "id": "pm_1OqSsRDEQaroqDjsOwZKBJPf",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json
index a8cd1350de..cb28196b1f 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json
index f5fbba0f4a..14926cdeab 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvN0s5bW5ibDFteEtNVllzRldJalA0d3Z3T0w2LDk4MDI4OTE50200vOUWMcf0?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WUU1tM0xIaE95UVlrZ2ppNlJKZnQ4eWtJckNzLDEwMDA2NjMxMg0200F1v9qcKT?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lvN0s5bW5ibDFteEtNVllzRldJalA0d3Z3T0w2LDk4MDI4OTE50200vOUWMcf0/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WUU1tM0xIaE95UVlrZ2ppNlJKZnQ4eWtJckNzLDEwMDA2NjMxMg0200F1v9qcKT/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json
index bff05f8388..30ec61bb99 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurGDEQaroqDjsQLB5QuKO_secret_PWyoF1WNa93hLbnvCrhEaQMW4UmgTeJ",
+  "client_secret": "seti_1OqSsRDEQaroqDjsE1sXo74e_secret_PfoVwlS1bkPI63d1lt6cZf9K0jfHvaE",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurGDEQaroqDjsQLB5QuKO",
+  "id": "seti_1OqSsRDEQaroqDjsE1sXo74e",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurGDEQaroqDjs9NhGo0Y3",
+  "latest_attempt": "setatt_1OqSsRDEQaroqDjsuBuRbcUK",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurGDEQaroqDjsw7GdWGLJ",
+  "payment_method": "pm_1OqSsRDEQaroqDjsOwZKBJPf",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json
index 18d3babb98..0f0225ccf3 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhurFDEQaroqDjs7fAyb3WY_secret_PWyosvWIl80S0xrin2un8mKn8mLHQFS",
+      "client_secret": "seti_1OqSsQDEQaroqDjs6jJ3HlEz_secret_PfoVO3FIA0jozReOtHeVuZRGozjlb6r",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhurFDEQaroqDjs7fAyb3WY",
+      "id": "seti_1OqSsQDEQaroqDjs6jJ3HlEz",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json
index bff05f8388..30ec61bb99 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurGDEQaroqDjsQLB5QuKO_secret_PWyoF1WNa93hLbnvCrhEaQMW4UmgTeJ",
+  "client_secret": "seti_1OqSsRDEQaroqDjsE1sXo74e_secret_PfoVwlS1bkPI63d1lt6cZf9K0jfHvaE",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurGDEQaroqDjsQLB5QuKO",
+  "id": "seti_1OqSsRDEQaroqDjsE1sXo74e",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurGDEQaroqDjs9NhGo0Y3",
+  "latest_attempt": "setatt_1OqSsRDEQaroqDjsuBuRbcUK",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurGDEQaroqDjsw7GdWGLJ",
+  "payment_method": "pm_1OqSsRDEQaroqDjsOwZKBJPf",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json
index a055c66bb5..a0aa3779c1 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02jYxN3TBMihzQWv4WNbLHBGqQSthUk9xYBFknkQHaFNpGaI",
+  "id": "cs_test_NORMALIZED02lmtb6z2BYJDaIFBY8K2YfuQMJD1rU66zcBc9MIdb4iXkTt",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "9",
+    "remote_server_user_id": "10",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhurFDEQaroqDjs7fAyb3WY",
+  "setup_intent": "seti_1OqSsQDEQaroqDjs6jJ3HlEz",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02jYxN3TBMihzQWv4WNbLHBGqQSthUk9xYBFknkQHaFNpGaI#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02lmtb6z2BYJDaIFBY8K2YfuQMJD1rU66zcBc9MIdb4iXkTt#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json
index be707decd8..a48ab12401 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02jYxN3TBMihzQWv4WNbLHBGqQSthUk9xYBFknkQHaFNpGaI",
+      "id": "cs_test_NORMALIZED02lmtb6z2BYJDaIFBY8K2YfuQMJD1rU66zcBc9MIdb4iXkTt",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "9",
+        "remote_server_user_id": "10",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhurFDEQaroqDjs7fAyb3WY",
+      "setup_intent": "seti_1OqSsQDEQaroqDjs6jJ3HlEz",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02jYxN3TBMihzQWv4WNbLHBGqQSthUk9xYBFknkQHaFNpGaI#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02lmtb6z2BYJDaIFBY8K2YfuQMJD1rU66zcBc9MIdb4iXkTt#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.modify.1.json
index 5ba26ffcb0..128263d8bc 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhurODEQaroqDjsU4nKLkqr",
+    "default_payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.1.json
index 88574a3fe8..49cbed693e 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurODEQaroqDjsU4nKLkqr",
+      "id": "pm_1OqSsZDEQaroqDjssdykqbZ0",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.2.json
index 88574a3fe8..49cbed693e 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurODEQaroqDjsU4nKLkqr",
+      "id": "pm_1OqSsZDEQaroqDjssdykqbZ0",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.3.json
index 88574a3fe8..49cbed693e 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurODEQaroqDjsU4nKLkqr",
+      "id": "pm_1OqSsZDEQaroqDjssdykqbZ0",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.4.json
index 88574a3fe8..49cbed693e 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurODEQaroqDjsU4nKLkqr",
+      "id": "pm_1OqSsZDEQaroqDjssdykqbZ0",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.5.json
index 4415aaf7f7..9000af443c 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurODEQaroqDjsU4nKLkqr",
+      "id": "pm_1OqSsZDEQaroqDjssdykqbZ0",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.1.json
index 15cd9643b0..ac45226d15 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhurODEQaroqDjsU4nKLkqr",
+            "default_payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhurQDEQaroqDjsTKOnacqm",
+      "id": "evt_1OqSsbDEQaroqDjsiPFi3W74",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "9b1683fc-b912-46c6-92ba-ddec5a2fd1f1"
+        "idempotency_key": "89d907e9-709f-4c8b-badc-c8ca667e7001"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.2.json
index 050a8ee4b6..ea51e1a37d 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhurODEQaroqDjsU4nKLkqr",
+                "payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 51600,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKILnmK4GMgbp4UMUX6A6LBZQd_AXPqrmX7MK0RY31JHDEP9Lhg0YphgtV13NJMlCU3-1XJc7r4cfsKH-?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJOUla8GMgYERBSiCdg6LBb-6xZDuKAf8sDoGYDRaGqnb8iHsGOE8Hqn9bxdMDAemGgFEP15xyRZNCBn?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_zLEisKs5pSKdH6ZuJl0zZjyVA",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_oQLuTmzs879k6LPIftRGukomD",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhurODEQaroqDjsU4nKLkqr",
+          "payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhurTDEQaroqDjs0aA8V4WK",
+      "id": "evt_3OqSseDEQaroqDjs0AGzlmiz",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "1ce6fc5b-9dc1-42f1-8602-49edc9caa095"
+        "idempotency_key": "3b141864-1921-463d-9cfc-71c3f41666ef"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 51600,
+          "amount_captured": 51600,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 51600,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 51600,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJOUla8GMgZIQ1f5PNo6LBba1IiT9VwlJu9uz4RlD28fsvzP43SFm8tsAiL-zIzS3SLSsQCjq2LVhby5?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSseDEQaroqDjs0WrJbdYm",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "3b141864-1921-463d-9cfc-71c3f41666ef"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTI40200IffEqSWY?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMQ0200CMuJKUCO?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTI40200IffEqSWY/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMQ0200CMuJKUCO/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -307,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -410,16 +540,16 @@
           "total_excluding_tax": 51600,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhurUDEQaroqDjspso4zzMh",
+      "id": "evt_1OqSsfDEQaroqDjstL7uVgwL",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a1b6d460-90aa-4ea6-9b97-8b0aa2d4707a"
+        "idempotency_key": "a3e105de-041b-430a-89a8-bbc86b68b714"
       },
       "type": "invoice.finalized"
     },
@@ -470,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTI40200IffEqSWY?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMQ0200CMuJKUCO?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTI40200IffEqSWY/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMQ0200CMuJKUCO/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -489,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -539,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -642,7 +774,7 @@
           "total_excluding_tax": 51600,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -662,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OhurUDEQaroqDjsHDQJYXZy",
+      "id": "evt_1OqSsfDEQaroqDjsdCPM5fxz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a1b6d460-90aa-4ea6-9b97-8b0aa2d4707a"
+        "idempotency_key": "a3e105de-041b-430a-89a8-bbc86b68b714"
       },
       "type": "invoice.updated"
     },
@@ -696,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_zLEisKs5pSKdH6ZuJl0zZjyVA",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_oQLuTmzs879k6LPIftRGukomD",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -739,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhurTDEQaroqDjs0Xhy1Tgr",
+      "id": "evt_3OqSseDEQaroqDjs0u2fG0iJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a1b6d460-90aa-4ea6-9b97-8b0aa2d4707a"
+        "idempotency_key": "a3e105de-041b-430a-89a8-bbc86b68b714"
       },
       "type": "payment_intent.created"
     },
@@ -815,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -865,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -968,16 +1102,16 @@
           "total_excluding_tax": 51600,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhurTDEQaroqDjsISZB2jrw",
+      "id": "evt_1OqSseDEQaroqDjsJzDOlTHJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "2cce131e-478b-49f6-a3c7-b1259e1a9032"
+        "idempotency_key": "721b8ae3-b3f8-492d-ba20-33f36f9302d5"
       },
       "type": "invoice.created"
     },
@@ -1033,13 +1167,13 @@
           "unit_amount_decimal": "-24000"
         }
       },
-      "id": "evt_1OhurSDEQaroqDjsid05jAf6",
+      "id": "evt_1OqSsdDEQaroqDjsXRXoVXUh",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "f8adf7ae-3d81-47eb-ba95-40fd8b4c69a1"
+        "idempotency_key": "46684fd7-4390-4b5e-aab0-3c91b246e7e9"
       },
       "type": "invoiceitem.created"
     },
@@ -1095,13 +1229,13 @@
           "unit_amount_decimal": "4200"
         }
       },
-      "id": "evt_1OhurSDEQaroqDjsTmjy0YFw",
+      "id": "evt_1OqSsdDEQaroqDjsHsWID6WD",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "0135f16e-8469-4f38-a1b9-7580d38c92e5"
+        "idempotency_key": "bfc0d681-2daf-4e01-876f-9a2493add90a"
       },
       "type": "invoiceitem.created"
     },
@@ -1124,7 +1258,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhurODEQaroqDjsU4nKLkqr",
+            "default_payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
             "footer": null,
             "rendering_options": null
           },
@@ -1147,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhurSDEQaroqDjsJcsWTUMy",
+      "id": "evt_1OqSsdDEQaroqDjsO0L4tMX9",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "0135f16e-8469-4f38-a1b9-7580d38c92e5"
+        "idempotency_key": "bfc0d681-2daf-4e01-876f-9a2493add90a"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.3.json
index 832c8f0d89..b50c606721 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMx0200QwyNhpYv?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMw0200YPmRfxfD?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMx0200QwyNhpYv/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMw0200YPmRfxfD/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -222,15 +224,15 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhurXDEQaroqDjsb8Aon1rI",
+      "id": "evt_1OqSshDEQaroqDjskFznhl1Z",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "1ce6fc5b-9dc1-42f1-8602-49edc9caa095"
+        "idempotency_key": "3b141864-1921-463d-9cfc-71c3f41666ef"
       },
-      "type": "invoice.paid"
+      "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -279,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMw0200KVa4QmZA?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMw0200YPmRfxfD?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMw0200KVa4QmZA/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMw0200YPmRfxfD/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +300,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +351,241 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 4200,
+                  "unit_amount_decimal": "4200"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 18,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "4200"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 51600,
+          "subtotal_excluding_tax": 51600,
+          "tax": null,
+          "test_clock": null,
+          "total": 51600,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 51600,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSshDEQaroqDjsa9w0mQhJ",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "3b141864-1921-463d-9cfc-71c3f41666ef"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 51600,
+          "amount_paid": 51600,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMw0200YPmRfxfD?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMw0200YPmRfxfD/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -24000,
+                "amount_excluding_tax": -24000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -24000,
+                  "unit_amount_decimal": "-24000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-24000"
+              },
+              {
+                "amount": 75600,
+                "amount_excluding_tax": 75600,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhurWDEQaroqDjsXNTs0zM2",
+      "id": "evt_1OqSshDEQaroqDjsOjoRg191",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "1ce6fc5b-9dc1-42f1-8602-49edc9caa095"
+        "idempotency_key": "3b141864-1921-463d-9cfc-71c3f41666ef"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.4.json
index bfafd52b12..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 51600,
-          "amount_paid": 51600,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMx0200QwyNhpYv?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMx0200QwyNhpYv/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -24000,
-                "amount_excluding_tax": -24000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -24000,
-                  "unit_amount_decimal": "-24000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-24000"
-              },
-              {
-                "amount": 75600,
-                "amount_excluding_tax": 75600,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 4200,
-                  "unit_amount_decimal": "4200"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 18,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "4200"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 51600,
-          "subtotal_excluding_tax": 51600,
-          "tax": null,
-          "test_clock": null,
-          "total": 51600,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 51600,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhurXDEQaroqDjsS3CLfp19",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "1ce6fc5b-9dc1-42f1-8602-49edc9caa095"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.1.json
index 4e5ce54f1b..5a013b3449 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 51600,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.2.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.2.json
index 666c7c8f8d..775784546c 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.1.json
index 0d738d3e0e..1fb6ec8e09 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTI40200IffEqSWY?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMQ0200CMuJKUCO?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTI40200IffEqSWY/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMQ0200CMuJKUCO/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 51600,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.2.json
index 520cf528c9..8a0ddf1991 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwbFpxd0J6RzE2cW5rVWlPREpwaEZTYzdjVkF3LDk4MDI4OTMz0200SdPIuPug?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkZKWmw3cGJtd1VJUURlTDBIcnlaMzM0eVpILDEwMDA2NjMyNg0200JWwBSg5r?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwbFpxd0J6RzE2cW5rVWlPREpwaEZTYzdjVkF3LDk4MDI4OTMz0200SdPIuPug/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkZKWmw3cGJtd1VJUURlTDBIcnlaMzM0eVpILDEwMDA2NjMyNg0200JWwBSg5r/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.pay.1.json
index 34626d07f9..8bb3038b6f 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMw0200KVa4QmZA?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMg0200m8TvpHMy?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lweTJVa0prMjdDR2hTWkIwQnBrUng0ajZwRWxtLDk4MDI4OTMw0200KVa4QmZA/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WZkRiOEFLTHpzSms2djdPeDM0SUw5MEZvY1k3LDEwMDA2NjMyMg0200m8TvpHMy/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.create.1.json
index 00a3849657..17f1d10e5e 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurODEQaroqDjsM52abW6s_secret_PWypTznsosIrsunxXVGiUwKqMJlGI2E",
+  "client_secret": "seti_1OqSsZDEQaroqDjszn2QfMBP_secret_PfoVh3OJoax17gflN86yczJ6T4tOBp5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurODEQaroqDjsM52abW6s",
+  "id": "seti_1OqSsZDEQaroqDjszn2QfMBP",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurODEQaroqDjsw8bAKWJ3",
+  "latest_attempt": "setatt_1OqSsZDEQaroqDjscXIGAMet",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurODEQaroqDjsU4nKLkqr",
+  "payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.list.1.json
index 20ca6a51cc..3bdd41c00e 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhurNDEQaroqDjsNFPN1b8O_secret_PWypWBdhGWQPB9GzjeaHRUMQsi5s2MF",
+      "client_secret": "seti_1OqSsYDEQaroqDjsQjJQ3cGh_secret_PfoViyLZevtaUNeDVVLa3lvyN3kC5mH",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhurNDEQaroqDjsNFPN1b8O",
+      "id": "seti_1OqSsYDEQaroqDjsQjJQ3cGh",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.retrieve.1.json
index 00a3849657..17f1d10e5e 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurODEQaroqDjsM52abW6s_secret_PWypTznsosIrsunxXVGiUwKqMJlGI2E",
+  "client_secret": "seti_1OqSsZDEQaroqDjszn2QfMBP_secret_PfoVh3OJoax17gflN86yczJ6T4tOBp5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurODEQaroqDjsM52abW6s",
+  "id": "seti_1OqSsZDEQaroqDjszn2QfMBP",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurODEQaroqDjsw8bAKWJ3",
+  "latest_attempt": "setatt_1OqSsZDEQaroqDjscXIGAMet",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurODEQaroqDjsU4nKLkqr",
+  "payment_method": "pm_1OqSsZDEQaroqDjssdykqbZ0",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.create.1.json
index 30fb066c20..55437a65da 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02V9lQJDmCdxWJ71A8qAOgupfT0vzLd0QncarPEjq9e6cngd",
+  "id": "cs_test_NORMALIZED02DVJXHYidZppWTvFY53RWm7zfO5fGM3cw9UZffBtoIMeDY4",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "10",
+    "remote_server_user_id": "11",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhurNDEQaroqDjsNFPN1b8O",
+  "setup_intent": "seti_1OqSsYDEQaroqDjsQjJQ3cGh",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02V9lQJDmCdxWJ71A8qAOgupfT0vzLd0QncarPEjq9e6cngd#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02DVJXHYidZppWTvFY53RWm7zfO5fGM3cw9UZffBtoIMeDY4#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.list.1.json
index f9c94c99bb..fc34413767 100644
--- a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02V9lQJDmCdxWJ71A8qAOgupfT0vzLd0QncarPEjq9e6cngd",
+      "id": "cs_test_NORMALIZED02DVJXHYidZppWTvFY53RWm7zfO5fGM3cw9UZffBtoIMeDY4",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "10",
+        "remote_server_user_id": "11",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhurNDEQaroqDjsNFPN1b8O",
+      "setup_intent": "seti_1OqSsYDEQaroqDjsQjJQ3cGh",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02V9lQJDmCdxWJ71A8qAOgupfT0vzLd0QncarPEjq9e6cngd#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02DVJXHYidZppWTvFY53RWm7zfO5fGM3cw9UZffBtoIMeDY4#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.modify.1.json
index da10a5843e..9d7c5b037d 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+    "default_payment_method": "pm_1OqSpxDEQaroqDjsDoauLQMn",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.1.json
index 1192e9d006..969553bb0f 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+      "id": "pm_1OqSpxDEQaroqDjsDoauLQMn",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.2.json
index 1192e9d006..969553bb0f 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+      "id": "pm_1OqSpxDEQaroqDjsDoauLQMn",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.3.json
index 1192e9d006..969553bb0f 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+      "id": "pm_1OqSpxDEQaroqDjsDoauLQMn",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.4.json
index 1192e9d006..969553bb0f 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+      "id": "pm_1OqSpxDEQaroqDjsDoauLQMn",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.5.json
index bc3c39d317..01dcb2114e 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.5.json
@@ -6,7 +6,7 @@
   "default_currency": "usd",
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+      "id": "pm_1OqSpxDEQaroqDjsDoauLQMn",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 3,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.1.json
index f06d999cd3..fde1a251f5 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+            "default_payment_method": "pm_1OqSpxDEQaroqDjsDoauLQMn",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhupADEQaroqDjsBTqDsbdM",
+      "id": "evt_1OqSpzDEQaroqDjsLE1XXCev",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "594ce193-67aa-4743-90ad-266247bf6960"
+        "idempotency_key": "3375d600-46df-4b5e-b46f-af8287bad0c5"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.2.json
index 434f26dc59..647f45385b 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+                "payment_method": "pm_1OqSpxDEQaroqDjsDoauLQMn",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 22200,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKPflmK4GMgbbRMtmTdY6LBYqZYnGOCD5OP4ncKYmKkSJnBLHg5cBj0QivFYTRAciqpGUHdfNxI2yvsXH?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKPGSla8GMgYU7nhJQRg6LBbEtUSmA6uIRZ4mc3_0KUx3la1GD2V6bm4pZQX5KyvhGOFC-ClwW1daeZJh?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_pkplc07Vu1YT8PGOERMNzBrpr",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_whXVKjAzXcCkGhxpVUtkpyuzl",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+          "payment_method": "pm_1OqSpxDEQaroqDjsDoauLQMn",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhupEDEQaroqDjs0mt6ykeo",
+      "id": "evt_3OqSq2DEQaroqDjs1WCUTvmj",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "dd081dd8-9d25-41d6-a705-41ffd8048ce0"
+        "idempotency_key": "bd4fa074-f837-4dd3-b133-5ac2b42ff8b6"
       },
       "type": "payment_intent.succeeded"
     },
@@ -238,9 +238,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzg50200mOJmEvV1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE1OQ0200N1xwPpfl?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzg50200mOJmEvV1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE1OQ0200N1xwPpfl/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +257,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -307,6 +308,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -410,16 +412,16 @@
           "total_excluding_tax": 22200,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupFDEQaroqDjswpcsVK8t",
+      "id": "evt_1OqSq3DEQaroqDjsx9pHwguc",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a23d9d11-aab2-449e-a53d-63b2cf05e17a"
+        "idempotency_key": "310a8450-81a7-49bd-a2d1-b90512ca783d"
       },
       "type": "invoice.finalized"
     },
@@ -470,9 +472,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzg50200mOJmEvV1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE1OQ0200N1xwPpfl?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzg50200mOJmEvV1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE1OQ0200N1xwPpfl/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -489,6 +491,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -539,6 +542,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -642,7 +646,7 @@
           "total_excluding_tax": 22200,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -662,13 +666,13 @@
           }
         }
       },
-      "id": "evt_1OhupFDEQaroqDjsn4VaDBxE",
+      "id": "evt_1OqSq3DEQaroqDjsy0VZhNga",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a23d9d11-aab2-449e-a53d-63b2cf05e17a"
+        "idempotency_key": "310a8450-81a7-49bd-a2d1-b90512ca783d"
       },
       "type": "invoice.updated"
     },
@@ -696,7 +700,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_pkplc07Vu1YT8PGOERMNzBrpr",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_whXVKjAzXcCkGhxpVUtkpyuzl",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -739,13 +743,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhupEDEQaroqDjs0uKLVXvL",
+      "id": "evt_3OqSq2DEQaroqDjs1gSVo2hz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a23d9d11-aab2-449e-a53d-63b2cf05e17a"
+        "idempotency_key": "310a8450-81a7-49bd-a2d1-b90512ca783d"
       },
       "type": "payment_intent.created"
     },
@@ -815,6 +819,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -865,6 +870,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -968,16 +974,16 @@
           "total_excluding_tax": 22200,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupEDEQaroqDjsYX6qhvE7",
+      "id": "evt_1OqSq2DEQaroqDjsMs7juO2J",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "a8b4dc71-828c-427b-9e55-be63292cd276"
+        "idempotency_key": "376318cb-0711-4c04-a513-456641929be5"
       },
       "type": "invoice.created"
     },
@@ -1033,13 +1039,13 @@
           "unit_amount_decimal": "-24000"
         }
       },
-      "id": "evt_1OhupDDEQaroqDjsx6bncUeN",
+      "id": "evt_1OqSq1DEQaroqDjsfEPtVhyO",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "55c68560-0847-4e0d-9492-48fd04279723"
+        "idempotency_key": "116cfdce-ac36-44f7-adad-9bb079bb5b9d"
       },
       "type": "invoiceitem.created"
     },
@@ -1095,13 +1101,13 @@
           "unit_amount_decimal": "4200"
         }
       },
-      "id": "evt_1OhupDDEQaroqDjsb9tFLTPA",
+      "id": "evt_1OqSq1DEQaroqDjsx7XN7R77",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "4887b7d6-7e9c-442d-8324-b48238ecff23"
+        "idempotency_key": "83e17e2c-b9e3-4365-afd6-f4ce1d64478f"
       },
       "type": "invoiceitem.created"
     },
@@ -1117,21 +1123,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+            "default_payment_method": "pm_1OqSpxDEQaroqDjsDoauLQMn",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1147,13 +1153,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhupDDEQaroqDjsSZ9fkVqb",
+      "id": "evt_1OqSq1DEQaroqDjsik5tv5gH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "4887b7d6-7e9c-442d-8324-b48238ecff23"
+        "idempotency_key": "83e17e2c-b9e3-4365-afd6-f4ce1d64478f"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.3.json
index 2f5cccf8c1..be043d966c 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzkx02004vQghf9h?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MQ0200ah68gUYG?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzkx02004vQghf9h/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MQ0200ah68gUYG/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -222,15 +224,15 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupHDEQaroqDjsRmUqiGpp",
+      "id": "evt_1OqSq5DEQaroqDjs45D45TYM",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "dd081dd8-9d25-41d6-a705-41ffd8048ce0"
+        "idempotency_key": "bd4fa074-f837-4dd3-b133-5ac2b42ff8b6"
       },
-      "type": "invoice.paid"
+      "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -279,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzkx02004vQghf9h?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MQ0200ah68gUYG?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzkx02004vQghf9h/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MQ0200ah68gUYG/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +300,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +351,241 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 4200,
+                  "unit_amount_decimal": "4200"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 11,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "4200"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "11",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 22200,
+          "subtotal_excluding_tax": 22200,
+          "tax": null,
+          "test_clock": null,
+          "total": 22200,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 22200,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSq5DEQaroqDjsXmTPM7RA",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "bd4fa074-f837-4dd3-b133-5ac2b42ff8b6"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 22200,
+          "amount_paid": 22200,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MQ0200ah68gUYG?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MQ0200ah68gUYG/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -24000,
+                "amount_excluding_tax": -24000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -24000,
+                  "unit_amount_decimal": "-24000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-24000"
+              },
+              {
+                "amount": 46200,
+                "amount_excluding_tax": 46200,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhupHDEQaroqDjsIqVStI3M",
+      "id": "evt_1OqSq5DEQaroqDjsjvlxKj4I",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "dd081dd8-9d25-41d6-a705-41ffd8048ce0"
+        "idempotency_key": "bd4fa074-f837-4dd3-b133-5ac2b42ff8b6"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.4.json
index a07e6d838c..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 22200,
-          "amount_paid": 22200,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzky0200YJR4MpT3?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzky0200YJR4MpT3/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -24000,
-                "amount_excluding_tax": -24000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -24000,
-                  "unit_amount_decimal": "-24000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-24000"
-              },
-              {
-                "amount": 46200,
-                "amount_excluding_tax": 46200,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 4200,
-                  "unit_amount_decimal": "4200"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 11,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "4200"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "11",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 22200,
-          "subtotal_excluding_tax": 22200,
-          "tax": null,
-          "test_clock": null,
-          "total": 22200,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 22200,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhupIDEQaroqDjsDbqGyMP3",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "dd081dd8-9d25-41d6-a705-41ffd8048ce0"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.1.json
index 58c6626e8d..90938c5f4f 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 22200,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.2.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.2.json
index 666c7c8f8d..775784546c 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.1.json
index 2782f68efc..7eeb6af13d 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzg40200IYxKEVTK?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE1OQ0200N1xwPpfl?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzg40200IYxKEVTK/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE1OQ0200N1xwPpfl/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 22200,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.2.json
index 62dcf305f2..02833e22b2 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltaHIzZVM5MU0zV3BnYWdrZEhESENkeTFXeHJBLDk4MDI4Nzk00200vG8bb8Lj?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UbnJ3cXdWRHR3MnNMNVNtZUpGc3RuaWtRbW10LDEwMDA2NjE2NA0200UqFU4Wvs?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltaHIzZVM5MU0zV3BnYWdrZEhESENkeTFXeHJBLDk4MDI4Nzk00200vG8bb8Lj/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UbnJ3cXdWRHR3MnNMNVNtZUpGc3RuaWtRbW10LDEwMDA2NjE2NA0200UqFU4Wvs/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 120000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.pay.1.json
index 162c3673bf..572287e4b0 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzkx02004vQghf9h?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MA02005dmlwTFL?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3ltNFhkekt1bThDdklsTEFJalZqY0lwVXc2RzhlLDk4MDI4Nzkx02004vQghf9h/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Td3lVb3o4Zm50Y3htRTVtZXN6Rmo3SGJhWkZWLDEwMDA2NjE2MA02005dmlwTFL/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.create.1.json
index 7322b4eefe..fd9e463304 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohup8DEQaroqDjsS3icF6mp_secret_PWymaHkZbtKTmK4Vh7EU5Nwag0dVOR8",
+  "client_secret": "seti_1OqSpxDEQaroqDjsGSvc4plz_secret_PfoSgUxAxad1eSiXR3v4TeTMxtzDu61",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohup8DEQaroqDjsS3icF6mp",
+  "id": "seti_1OqSpxDEQaroqDjsGSvc4plz",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohup9DEQaroqDjszgLYiAAS",
+  "latest_attempt": "setatt_1OqSpxDEQaroqDjshqycg0Bh",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+  "payment_method": "pm_1OqSpxDEQaroqDjsDoauLQMn",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.list.1.json
index 7c5cd8065f..4e149cb22a 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohup8DEQaroqDjsXHDbyrEF_secret_PWymF5PEXI7FR9AM2YkvDrhApfy6Aui",
+      "client_secret": "seti_1OqSpwDEQaroqDjsNcke3H14_secret_PfoSdjth037RS3XnZUDHovlzTAzZ3qR",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohup8DEQaroqDjsXHDbyrEF",
+      "id": "seti_1OqSpwDEQaroqDjsNcke3H14",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.retrieve.1.json
index 7322b4eefe..fd9e463304 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohup8DEQaroqDjsS3icF6mp_secret_PWymaHkZbtKTmK4Vh7EU5Nwag0dVOR8",
+  "client_secret": "seti_1OqSpxDEQaroqDjsGSvc4plz_secret_PfoSgUxAxad1eSiXR3v4TeTMxtzDu61",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohup8DEQaroqDjsS3icF6mp",
+  "id": "seti_1OqSpxDEQaroqDjsGSvc4plz",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohup9DEQaroqDjszgLYiAAS",
+  "latest_attempt": "setatt_1OqSpxDEQaroqDjshqycg0Bh",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohup8DEQaroqDjsGOFTSx1x",
+  "payment_method": "pm_1OqSpxDEQaroqDjsDoauLQMn",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.create.1.json
index 3d81ab26e4..52d85f0d6e 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02KrgSceYApZKRlcGsxv3tjK0P7nxb9XsUKenPwvSBVjJrdS",
+  "id": "cs_test_NORMALIZED02CWgv8yL0RQrpy7YfyB9KmgOM6JFJvVFM4kWNN2ZGkdRZfa",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohup8DEQaroqDjsXHDbyrEF",
+  "setup_intent": "seti_1OqSpwDEQaroqDjsNcke3H14",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02KrgSceYApZKRlcGsxv3tjK0P7nxb9XsUKenPwvSBVjJrdS#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02CWgv8yL0RQrpy7YfyB9KmgOM6JFJvVFM4kWNN2ZGkdRZfa#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.list.1.json
index a1009d1086..a13bb5dcf2 100644
--- a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02KrgSceYApZKRlcGsxv3tjK0P7nxb9XsUKenPwvSBVjJrdS",
+      "id": "cs_test_NORMALIZED02CWgv8yL0RQrpy7YfyB9KmgOM6JFJvVFM4kWNN2ZGkdRZfa",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohup8DEQaroqDjsXHDbyrEF",
+      "setup_intent": "seti_1OqSpwDEQaroqDjsNcke3H14",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02KrgSceYApZKRlcGsxv3tjK0P7nxb9XsUKenPwvSBVjJrdS#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02CWgv8yL0RQrpy7YfyB9KmgOM6JFJvVFM4kWNN2ZGkdRZfa#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.modify.1.json
index 6e9246ff35..7d2257b4f1 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+    "default_payment_method": "pm_1OqSlhDEQaroqDjs8ti25NEr",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.1.json
index ae95911774..f8158bcec1 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+      "id": "pm_1OqSlhDEQaroqDjs8ti25NEr",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.2.json
index ae95911774..f8158bcec1 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+      "id": "pm_1OqSlhDEQaroqDjs8ti25NEr",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.3.json
index ae95911774..f8158bcec1 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+      "id": "pm_1OqSlhDEQaroqDjs8ti25NEr",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.4.json
index ae95911774..f8158bcec1 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+      "id": "pm_1OqSlhDEQaroqDjs8ti25NEr",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.1.json
index 714670a73c..9f52d82ad0 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.1.json
@@ -5,53 +5,178 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "address": null,
-          "balance": 0,
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
           "created": 1000000000,
-          "currency": null,
-          "default_currency": null,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0002",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
           "default_source": null,
-          "delinquent": false,
-          "description": "zulip (Zulip Dev)",
+          "default_tax_rates": [],
+          "description": null,
           "discount": null,
-          "email": "hamlet@zulip.com",
-          "id": "cus_NORMALIZED0001",
-          "invoice_prefix": "NORMA01",
-          "invoice_settings": {
-            "custom_fields": null,
-            "default_payment_method": "pm_1OhulNDEQaroqDjsOYVqnoxN",
-            "footer": null,
-            "rendering_options": null
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg5Mg0200mthPf7T9?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ObTdNTnBQNzByWVY4ZXBtalQzaXVYdnVSRE95LDEwMDA2NTg5Mg0200mthPf7T9/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard - renewal",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1362193445,
+                  "start": 1330657445
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
-          "metadata": {
-            "realm_id": "1",
-            "realm_str": "zulip"
+          "metadata": {},
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
           },
-          "name": null,
-          "next_invoice_sequence": 1,
-          "object": "customer",
-          "phone": null,
-          "preferred_locales": [],
-          "shipping": null,
-          "tax_exempt": "none",
-          "test_clock": null
-        },
-        "previous_attributes": {
-          "invoice_settings": {
-            "default_payment_method": null
-          }
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhulPDEQaroqDjspYWHzFhZ",
+      "id": "evt_1OqSlkDEQaroqDjsN1rr3Vkn",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0001",
-        "idempotency_key": "46fe3807-e5b0-46d7-92ca-2e5bd30bb076"
+        "id": null,
+        "idempotency_key": null
       },
-      "type": "customer.updated"
+      "type": "invoice.sent"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.2.json
index 597a2033ff..237caee604 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.2.json
@@ -54,7 +54,7 @@
                 "failure_message": null,
                 "fraud_details": {},
                 "id": "ch_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "charge",
@@ -69,8 +69,8 @@
                   "type": "authorized"
                 },
                 "paid": true,
-                "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+                "payment_intent": "pi_NORMALIZED00000000000002",
+                "payment_method": "pm_1OqSlhDEQaroqDjs8ti25NEr",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKI3kmK4GMgaLr-CEtnY6LBZkCC3iWRYUNpRe5sxOfiBQbIFKu_7QeT-amhug4d9qHisjMc81yE3zyySB?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOiQla8GMga8OHmUZ106LBbDj5_1oDJdnYt5-qS6r9tSDO6Xp72QuBphJN8FT9FQ_QFkYbZhuVI2rSSj?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -136,16 +136,16 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_JrS7tzT8wRoOysCX21u1Cq7Yz",
+          "client_secret": "pi_NORMALIZED00000000000002_secret_YaxUqFBpes6IlA8o528XukEuy",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
           "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000001",
-          "invoice": "in_NORMALIZED00000000000001",
+          "id": "pi_NORMALIZED00000000000002",
+          "invoice": "in_NORMALIZED00000000000002",
           "last_payment_error": null,
           "latest_charge": "ch_NORMALIZED00000000000001",
           "livemode": false,
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+          "payment_method": "pm_1OqSlhDEQaroqDjs8ti25NEr",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhulSDEQaroqDjs16PjdxDG",
+      "id": "evt_3OqSlmDEQaroqDjs1IafkSxQ",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "19ee1bca-dff1-4ab0-b4f7-a5d7c125d568"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "40ebb5ae-2937-497a-8b9d-2715d262b1ed"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000002",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_method": "pm_1OqSlhDEQaroqDjs8ti25NEr",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOiQla8GMgbKcKxr0Pg6LBYm4eW5Yk8JFfTS1oNuElhZIkyGSpdHI7uSM5HwEoRZbHsd7LY1EW7I5Egl?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSlmDEQaroqDjs1q1GZxmf",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "40ebb5ae-2937-497a-8b9d-2715d262b1ed"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU102000WbQFHzx?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU102000WbQFHzx/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5NQ0200hR3BnSJV?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5NQ0200hR3BnSJV/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -256,8 +384,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -272,13 +401,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -302,7 +431,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
           },
           "livemode": false,
           "metadata": {
@@ -313,12 +442,12 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
           "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_intent": "pi_NORMALIZED00000000000002",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -361,16 +490,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhulTDEQaroqDjsHOKDW9tB",
+      "id": "evt_1OqSlnDEQaroqDjsFFGugIFx",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "a513a31a-8575-4732-b01e-81eacf324229"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "69a0a778-fb82-4d01-9eb8-9b4366a329ac"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU102000WbQFHzx?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU102000WbQFHzx/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5NQ0200hR3BnSJV?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5NQ0200hR3BnSJV/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -439,8 +568,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -455,13 +585,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -485,7 +615,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
           },
           "livemode": false,
           "metadata": {
@@ -496,12 +626,12 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0001",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
           "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_intent": "pi_NORMALIZED00000000000002",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -544,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhulTDEQaroqDjsIAiEVLpP",
+      "id": "evt_1OqSlnDEQaroqDjsI7lhDj5M",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "a513a31a-8575-4732-b01e-81eacf324229"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "69a0a778-fb82-4d01-9eb8-9b4366a329ac"
       },
       "type": "invoice.updated"
     },
@@ -596,16 +726,16 @@
             "has_more": false,
             "object": "list",
             "total_count": 0,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_JrS7tzT8wRoOysCX21u1Cq7Yz",
+          "client_secret": "pi_NORMALIZED00000000000002_secret_YaxUqFBpes6IlA8o528XukEuy",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
           "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000001",
-          "invoice": "in_NORMALIZED00000000000001",
+          "id": "pi_NORMALIZED00000000000002",
+          "invoice": "in_NORMALIZED00000000000002",
           "last_payment_error": null,
           "latest_charge": null,
           "livemode": false,
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhulSDEQaroqDjs1DIBPYHI",
+      "id": "evt_3OqSlmDEQaroqDjs1MQOsNnf",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "a513a31a-8575-4732-b01e-81eacf324229"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "69a0a778-fb82-4d01-9eb8-9b4366a329ac"
       },
       "type": "payment_intent.created"
     },
@@ -699,7 +829,7 @@
           "footer": null,
           "from_invoice": null,
           "hosted_invoice_url": null,
-          "id": "in_NORMALIZED00000000000001",
+          "id": "in_NORMALIZED00000000000002",
           "invoice_pdf": null,
           "issuer": {
             "type": "self"
@@ -716,8 +846,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -732,13 +863,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -762,7 +893,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
           },
           "livemode": false,
           "metadata": {
@@ -821,16 +952,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhulSDEQaroqDjsDALHUPdf",
+      "id": "evt_1OqSlmDEQaroqDjsHMbLX3Uv",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0004",
-        "idempotency_key": "3bd628c3-73fa-4769-8c21-715feb79c000"
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "85ea737f-5483-4270-a434-c866fd6601a4"
       },
       "type": "invoice.created"
     },
@@ -846,7 +977,7 @@
           "description": "Zulip Cloud Standard",
           "discountable": false,
           "discounts": [],
-          "id": "ii_NORMALIZED00000000000001",
+          "id": "ii_NORMALIZED00000000000002",
           "invoice": null,
           "livemode": false,
           "metadata": {},
@@ -862,13 +993,13 @@
             "created": 1000000000,
             "currency": "usd",
             "custom_unit_amount": null,
-            "id": "price_NORMALIZED00000000000001",
+            "id": "price_NORMALIZED00000000000002",
             "livemode": false,
             "lookup_key": null,
             "metadata": {},
             "nickname": null,
             "object": "price",
-            "product": "prod_NORMALIZED0001",
+            "product": "prod_NORMALIZED0002",
             "recurring": null,
             "tax_behavior": "unspecified",
             "tiers_mode": null,
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhulRDEQaroqDjs0pDZ32Eq",
+      "id": "evt_1OqSllDEQaroqDjsXaK7Asgj",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0005",
-        "idempotency_key": "4a06747e-50b8-4f13-94cf-6fdb9a3822d1"
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "16a6c378-0d9d-4b81-8f10-f6dcd122a53c"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+            "default_payment_method": "pm_1OqSlhDEQaroqDjs8ti25NEr",
             "footer": null,
             "rendering_options": null
           },
@@ -938,15 +1069,193 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhulRDEQaroqDjszAy2nueB",
+      "id": "evt_1OqSllDEQaroqDjsu38psUxq",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0005",
-        "idempotency_key": "4a06747e-50b8-4f13-94cf-6fdb9a3822d1"
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "16a6c378-0d9d-4b81-8f10-f6dcd122a53c"
       },
       "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0002",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OS2E4cWJ4YnRVREl2RUZEYXBSSmF0c3R6MjFiLDEwMDA2NTg5Mg020005Z9mA5y?s=ap",
+          "id": "in_NORMALIZED00000000000003",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9OS2E4cWJ4YnRVREl2RUZEYXBSSmF0c3R6MjFiLDEwMDA2NTg5Mg020005Z9mA5y/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard - renewal",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000003",
+                "invoice": "in_NORMALIZED00000000000003",
+                "invoice_item": "ii_NORMALIZED00000000000003",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1393729445,
+                  "start": 1362193445
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000003/lines"
+          },
+          "livemode": false,
+          "metadata": {},
+          "next_payment_attempt": null,
+          "number": "NORMALI-0003",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000003",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSlkDEQaroqDjs6gY8LRb5",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": null
+      },
+      "type": "invoice.sent"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.3.json
index 54eb1e3972..e4b008d286 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Nw0200XuNJxNMR?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Nw0200XuNJxNMR/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -65,8 +65,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -81,13 +82,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -111,7 +112,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
           },
           "livemode": false,
           "metadata": {
@@ -122,12 +123,12 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0002",
+          "number": "NORMALI-0004",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_intent": "pi_NORMALIZED00000000000002",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -173,13 +174,197 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhulVDEQaroqDjs8dYGYkYw",
+      "id": "evt_1OqSlpDEQaroqDjsEzfTTn8k",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "19ee1bca-dff1-4ab0-b4f7-a5d7c125d568"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "40ebb5ae-2937-497a-8b9d-2715d262b1ed"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Nw0200XuNJxNMR?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Nw0200XuNJxNMR/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0004",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSlpDEQaroqDjs0CJmKwXa",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "40ebb5ae-2937-497a-8b9d-2715d262b1ed"
       },
       "type": "invoice.paid"
     },
@@ -230,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Ng0200pt2gbrSn?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Ng0200pt2gbrSn/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -248,8 +433,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -264,13 +450,13 @@
                   "created": 1000000000,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0001",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -294,7 +480,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
           },
           "livemode": false,
           "metadata": {
@@ -305,12 +491,12 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0002",
+          "number": "NORMALI-0004",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_intent": "pi_NORMALIZED00000000000002",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -368,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhulVDEQaroqDjsLhamVCIj",
+      "id": "evt_1OqSlpDEQaroqDjsV0RCWnlf",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "19ee1bca-dff1-4ab0-b4f7-a5d7c125d568"
+        "id": "req_NORMALIZED0001",
+        "idempotency_key": "40ebb5ae-2937-497a-8b9d-2715d262b1ed"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.4.json
index d0d730e29d..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.4.json
@@ -1,189 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhulVDEQaroqDjszJzliLld",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "19ee1bca-dff1-4ab0-b4f7-a5d7c125d568"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.create.1.json
index f4f30938d0..b31c908fc8 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.create.1.json
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000001",
+  "id": "in_NORMALIZED00000000000002",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -105,7 +106,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
   "metadata": {
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.finalize_invoice.1.json
index ea2bdd7274..34379f6616 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU102000WbQFHzx?s=ap",
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU102000WbQFHzx/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5NA02006uvD73nv?s=ap",
+  "id": "in_NORMALIZED00000000000002",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5NA02006uvD73nv/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -105,7 +106,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
   "metadata": {
@@ -116,12 +117,12 @@
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0004",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_NORMALIZED00000000000001",
+  "payment_intent": "pi_NORMALIZED00000000000002",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.pay.1.json
index c99196d7a0..3025e8ce8e 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ?s=ap",
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lpQWpwQ3dUZ3pScHNRak1hNVo1Y3hIcFhMcjZDLDk4MDI4NTU30200Z7VteuUZ/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Ng0200pt2gbrSn?s=ap",
+  "id": "in_NORMALIZED00000000000002",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PT1BSNTY3ZGVoOGk3ZFRQbUdEY0didm5LV253LDEwMDA2NTg5Ng0200pt2gbrSn/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -75,13 +76,13 @@
           "created": 1000000000,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000001",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0001",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -105,7 +106,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
   "metadata": {
@@ -116,12 +117,12 @@
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0004",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
   "paid_out_of_band": false,
-  "payment_intent": "pi_NORMALIZED00000000000001",
+  "payment_intent": "pi_NORMALIZED00000000000002",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--InvoiceItem.create.1.json
index 23f69ee2e0..0fae7503f0 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--InvoiceItem.create.1.json
@@ -6,7 +6,7 @@
   "description": "Zulip Cloud Standard",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000001",
+  "id": "ii_NORMALIZED00000000000002",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -22,13 +22,13 @@
     "created": 1000000000,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000001",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0001",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.create.1.json
index fb196ae0a2..5842f2c70f 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhulNDEQaroqDjs4bgl1ReL_secret_PWyilQ58dLzVVnR1dmonzlMH4D8cdrx",
+  "client_secret": "seti_1OqSlhDEQaroqDjst1XmARZ2_secret_PfoOh2qWoI2c9rtLGjR6GbpHhNmV9bZ",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhulNDEQaroqDjs4bgl1ReL",
+  "id": "seti_1OqSlhDEQaroqDjst1XmARZ2",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhulNDEQaroqDjsSSot5arY",
+  "latest_attempt": "setatt_1OqSlhDEQaroqDjsA9JoTv5v",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+  "payment_method": "pm_1OqSlhDEQaroqDjs8ti25NEr",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.list.1.json
index bddb4a9992..05117a00e0 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhulMDEQaroqDjsqShDPeDz_secret_PWyiwhm31Z13qcxBbzkeXVZwmzIliMF",
+      "client_secret": "seti_1OqSlgDEQaroqDjs31L9KRlR_secret_PfoOFU2zXhEbY7mKcUITk96hJjbKJGO",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhulMDEQaroqDjsqShDPeDz",
+      "id": "seti_1OqSlgDEQaroqDjs31L9KRlR",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.retrieve.1.json
index fb196ae0a2..5842f2c70f 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhulNDEQaroqDjs4bgl1ReL_secret_PWyilQ58dLzVVnR1dmonzlMH4D8cdrx",
+  "client_secret": "seti_1OqSlhDEQaroqDjst1XmARZ2_secret_PfoOh2qWoI2c9rtLGjR6GbpHhNmV9bZ",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhulNDEQaroqDjs4bgl1ReL",
+  "id": "seti_1OqSlhDEQaroqDjst1XmARZ2",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhulNDEQaroqDjsSSot5arY",
+  "latest_attempt": "setatt_1OqSlhDEQaroqDjsA9JoTv5v",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhulNDEQaroqDjsOYVqnoxN",
+  "payment_method": "pm_1OqSlhDEQaroqDjs8ti25NEr",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.create.1.json
index 6fb8797f9c..f5eb9d73fa 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02SxWlzXTtmvZBSfJuyJ07e0x1p9N6gSVd8pKLuDeaoyfeS8",
+  "id": "cs_test_NORMALIZED02HCKmVagM7dZPVxffGv3qwCmQUhvNCrWgd981UjDzqdE1ws",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhulMDEQaroqDjsqShDPeDz",
+  "setup_intent": "seti_1OqSlgDEQaroqDjs31L9KRlR",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02SxWlzXTtmvZBSfJuyJ07e0x1p9N6gSVd8pKLuDeaoyfeS8#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02HCKmVagM7dZPVxffGv3qwCmQUhvNCrWgd981UjDzqdE1ws#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.list.1.json
index 43a85b8e47..0a510b4186 100644
--- a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02SxWlzXTtmvZBSfJuyJ07e0x1p9N6gSVd8pKLuDeaoyfeS8",
+      "id": "cs_test_NORMALIZED02HCKmVagM7dZPVxffGv3qwCmQUhvNCrWgd981UjDzqdE1ws",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhulMDEQaroqDjsqShDPeDz",
+      "setup_intent": "seti_1OqSlgDEQaroqDjs31L9KRlR",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02SxWlzXTtmvZBSfJuyJ07e0x1p9N6gSVd8pKLuDeaoyfeS8#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02HCKmVagM7dZPVxffGv3qwCmQUhvNCrWgd981UjDzqdE1ws#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.modify.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.modify.1.json
index 119c3f33a3..b82d542329 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OjJqzDEQaroqDjs0FeKtB14",
+    "default_payment_method": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.1.json
index 9db742b675..64b5fa57ea 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJqzDEQaroqDjs0FeKtB14",
+      "id": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.2.json
index 9db742b675..64b5fa57ea 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJqzDEQaroqDjs0FeKtB14",
+      "id": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.3.json
index 9db742b675..64b5fa57ea 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJqzDEQaroqDjs0FeKtB14",
+      "id": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.1.json
index ca6c49d046..b7f0be70be 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.1.json
@@ -5,26 +5,26 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "configuration": "bpc_1OjJr5DEQaroqDjsD8LS4MNX",
+          "configuration": "bpc_1OqSltDEQaroqDjsRJvbsMzN",
           "created": 1000000000,
           "customer": "cus_NORMALIZED0001",
           "flow": null,
-          "id": "bps_1OjJr6DEQaroqDjsZtwAM2Yq",
+          "id": "bps_1OqSluDEQaroqDjsVBSEItfj",
           "livemode": false,
           "locale": null,
           "object": "billing_portal.session",
           "on_behalf_of": null,
-          "return_url": "http://zulip.testserver/upgrade/?manual_license_management=false&tier=1",
-          "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpYmhWclkwTGVQTG5PNHdrRGpjaDg5cnlsM2s30100Tb4hCv8z"
+          "return_url": "http://zulip.testserver/upgrade/?manual_license_management=false&tier=1&setup_payment_by_invoice=false",
+          "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PNUxkSXgzM04wWTVNWjdrWmpsNXdlamw0NnJp0100nIF1RFtw"
         }
       },
-      "id": "evt_1OjJr6DEQaroqDjsvkep1CRl",
+      "id": "evt_1OqSluDEQaroqDjsomLYczMn",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "8e08dcce-8d3e-49c8-8a1c-4bce597b5b5f"
+        "idempotency_key": "82e3a02c-b44b-46da-9244-3dc34620284f"
       },
       "type": "billing_portal.session.created"
     }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.2.json
index 8791ae45ff..8e48dd19d5 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.2.json
@@ -1,196 +1,5 @@
 {
   "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
-          "amount_capturable": 0,
-          "amount_details": {
-            "tip": {}
-          },
-          "amount_received": 48000,
-          "application": null,
-          "application_fee_amount": null,
-          "automatic_payment_methods": null,
-          "canceled_at": null,
-          "cancellation_reason": null,
-          "capture_method": "automatic",
-          "charges": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_captured": 48000,
-                "amount_refunded": 0,
-                "application": null,
-                "application_fee": null,
-                "application_fee_amount": null,
-                "balance_transaction": "txn_NORMALIZED00000000000001",
-                "billing_details": {
-                  "address": {
-                    "city": null,
-                    "country": null,
-                    "line1": null,
-                    "line2": null,
-                    "postal_code": null,
-                    "state": null
-                  },
-                  "email": null,
-                  "name": null,
-                  "phone": null
-                },
-                "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
-                "captured": true,
-                "created": 1000000000,
-                "currency": "usd",
-                "customer": "cus_NORMALIZED0001",
-                "description": "Payment for Invoice",
-                "destination": null,
-                "dispute": null,
-                "disputed": false,
-                "failure_balance_transaction": null,
-                "failure_code": null,
-                "failure_message": null,
-                "fraud_details": {},
-                "id": "ch_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "charge",
-                "on_behalf_of": null,
-                "order": null,
-                "outcome": {
-                  "network_status": "approved_by_network",
-                  "reason": null,
-                  "risk_level": "normal",
-                  "risk_score": 0,
-                  "seller_message": "Payment complete.",
-                  "type": "authorized"
-                },
-                "paid": true,
-                "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OjJqzDEQaroqDjs0FeKtB14",
-                "payment_method_details": {
-                  "card": {
-                    "amount_authorized": 48000,
-                    "brand": "visa",
-                    "checks": {
-                      "address_line1_check": null,
-                      "address_postal_code_check": null,
-                      "cvc_check": "pass"
-                    },
-                    "country": "US",
-                    "exp_month": 2,
-                    "exp_year": 2025,
-                    "extended_authorization": {
-                      "status": "disabled"
-                    },
-                    "fingerprint": "NORMALIZED000001",
-                    "funding": "credit",
-                    "incremental_authorization": {
-                      "status": "unavailable"
-                    },
-                    "installments": null,
-                    "last4": "4242",
-                    "mandate": null,
-                    "multicapture": {
-                      "status": "unavailable"
-                    },
-                    "network": "visa",
-                    "network_token": {
-                      "used": false
-                    },
-                    "overcapture": {
-                      "maximum_amount_capturable": 48000,
-                      "status": "unavailable"
-                    },
-                    "three_d_secure": null,
-                    "wallet": null
-                  },
-                  "type": "card"
-                },
-                "radar_options": {},
-                "receipt_email": "hamlet@zulip.com",
-                "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMubra4GMgZ9x2_jLd46LBbTTFDLOaU4rn3jCYuGe2SsKgH3LwdYwLVfMdQYPknvEbjT78XEW4WwUjnU?s=ap",
-                "refunded": false,
-                "refunds": {
-                  "data": [],
-                  "has_more": false,
-                  "object": "list",
-                  "total_count": 0,
-                  "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
-                },
-                "review": null,
-                "shipping": null,
-                "source": null,
-                "source_transfer": null,
-                "statement_descriptor": "Zulip Cloud Standard",
-                "statement_descriptor_suffix": null,
-                "status": "succeeded",
-                "transfer_data": null,
-                "transfer_group": null
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
-          },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_d17b5Xz87GdhiOB7RrfdWJzqB",
-          "confirmation_method": "automatic",
-          "created": 1000000000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000001",
-          "invoice": "in_NORMALIZED00000000000001",
-          "last_payment_error": null,
-          "latest_charge": "ch_NORMALIZED00000000000001",
-          "livemode": false,
-          "metadata": {},
-          "next_action": null,
-          "object": "payment_intent",
-          "on_behalf_of": null,
-          "payment_method": "pm_1OjJqzDEQaroqDjs0FeKtB14",
-          "payment_method_configuration_details": null,
-          "payment_method_options": {
-            "card": {
-              "installments": null,
-              "mandate_options": null,
-              "network": null,
-              "request_three_d_secure": "automatic"
-            },
-            "cashapp": {}
-          },
-          "payment_method_types": [
-            "card",
-            "cashapp"
-          ],
-          "processing": null,
-          "receipt_email": "hamlet@zulip.com",
-          "review": null,
-          "setup_future_usage": null,
-          "shipping": null,
-          "source": null,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "statement_descriptor_suffix": null,
-          "status": "succeeded",
-          "transfer_data": null,
-          "transfer_group": null
-        }
-      },
-      "id": "evt_3OjJrADEQaroqDjs0UMNV16b",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 2,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "0b53583a-1fba-4661-b062-c6c5b63382a3"
-      },
-      "type": "payment_intent.succeeded"
-    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -199,9 +8,9 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
+          "amount_due": 984000,
           "amount_paid": 0,
-          "amount_remaining": 48000,
+          "amount_remaining": 984000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
@@ -215,7 +24,7 @@
           },
           "billing_reason": "manual",
           "charge": null,
-          "collection_method": "charge_automatically",
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -233,14 +42,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
+          "due_date": 1000000000,
           "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM30200QOqRGA4B?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM30200QOqRGA4B/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,8 +58,8 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
@@ -292,7 +101,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 123,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -308,8 +117,285 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": true,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "auto_advance": true,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "status": "open",
+          "status_transitions": {
+            "paid_at": null
+          }
+        }
+      },
+      "id": "evt_1OqSlyDEQaroqDjs5XEWJUDi",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "f1927e55-a11b-44f6-94ca-eb13ce069808"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": 1000000000,
+          "cancellation_reason": "requested_by_customer",
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+          },
+          "client_secret": "pi_NORMALIZED00000000000001_secret_KNxubUaX9tMs8oTibFKpfD2js",
+          "confirmation_method": "automatic",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
+          },
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "canceled",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSlxDEQaroqDjs1K1fbcua",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "f1927e55-a11b-44f6-94ca-eb13ce069808"
+      },
+      "type": "payment_intent.canceled"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
             "plan_tier": "1",
             "user_id": "10"
           },
@@ -353,25 +439,25 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 984000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 984000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJrBDEQaroqDjsi2YsN7fI",
+      "id": "evt_1OqSlyDEQaroqDjsdoaIFe3u",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "5fe9fe86-25f7-4cd4-a03d-d705b39d626b"
+        "idempotency_key": "1e910548-abe7-4191-90d6-0acb9f633c3c"
       },
       "type": "invoice.finalized"
     },
@@ -383,15 +469,15 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
+          "amount_due": 984000,
           "amount_paid": 0,
-          "amount_remaining": 48000,
+          "amount_remaining": 984000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
           "attempt_count": 0,
           "attempted": false,
-          "auto_advance": false,
+          "auto_advance": true,
           "automatic_tax": {
             "enabled": false,
             "liability": null,
@@ -399,7 +485,7 @@
           },
           "billing_reason": "manual",
           "charge": null,
-          "collection_method": "charge_automatically",
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -417,14 +503,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
+          "due_date": 1000000000,
           "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM30200QOqRGA4B?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNQ0200x3TCLX7R?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM30200QOqRGA4B/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNQ0200x3TCLX7R/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -433,8 +519,8 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
@@ -476,7 +562,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 123,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -492,8 +578,8 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "123",
             "plan_tier": "1",
             "user_id": "10"
           },
@@ -537,16 +623,16 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 984000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 984000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -566,13 +652,13 @@
           }
         }
       },
-      "id": "evt_1OjJrBDEQaroqDjsOxKGJgPJ",
+      "id": "evt_1OqSlxDEQaroqDjs2IElJdrM",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "5fe9fe86-25f7-4cd4-a03d-d705b39d626b"
+        "idempotency_key": "1e910548-abe7-4191-90d6-0acb9f633c3c"
       },
       "type": "invoice.updated"
     },
@@ -581,7 +667,7 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "amount": 48000,
+          "amount": 984000,
           "amount_capturable": 0,
           "amount_details": {
             "tip": {}
@@ -600,7 +686,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_d17b5Xz87GdhiOB7RrfdWJzqB",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_KNxubUaX9tMs8oTibFKpfD2js",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -624,11 +710,17 @@
               "network": null,
               "request_three_d_secure": "automatic"
             },
-            "cashapp": {}
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
           },
           "payment_method_types": [
+            "ach_credit_transfer",
             "card",
-            "cashapp"
+            "cashapp",
+            "wechat_pay"
           ],
           "processing": null,
           "receipt_email": "hamlet@zulip.com",
@@ -643,13 +735,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OjJrADEQaroqDjs0r2fnZqI",
+      "id": "evt_3OqSlxDEQaroqDjs1Y4yQZTC",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "5fe9fe86-25f7-4cd4-a03d-d705b39d626b"
+        "idempotency_key": "1e910548-abe7-4191-90d6-0acb9f633c3c"
       },
       "type": "payment_intent.created"
     },
@@ -661,15 +753,15 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
+          "amount_due": 984000,
           "amount_paid": 0,
-          "amount_remaining": 48000,
+          "amount_remaining": 984000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
           "attempt_count": 0,
           "attempted": false,
-          "auto_advance": false,
+          "auto_advance": true,
           "automatic_tax": {
             "enabled": false,
             "liability": null,
@@ -677,7 +769,7 @@
           },
           "billing_reason": "manual",
           "charge": null,
-          "collection_method": "charge_automatically",
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -695,7 +787,7 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
+          "due_date": 1000000000,
           "effective_at": null,
           "ending_balance": null,
           "footer": null,
@@ -711,8 +803,8 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
@@ -754,7 +846,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 123,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -770,8 +862,8 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "123",
             "plan_tier": "1",
             "user_id": "10"
           },
@@ -815,25 +907,25 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 984000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 984000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJrADEQaroqDjs04GaR1GS",
+      "id": "evt_1OqSlwDEQaroqDjsW5JnWn0G",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "6793ceb1-a357-4582-b54b-71eec52f9119"
+        "idempotency_key": "758dd1c5-47ce-4b62-a064-041754df0882"
       },
       "type": "invoice.created"
     },
@@ -842,7 +934,7 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "amount": 48000,
+          "amount": 984000,
           "currency": "usd",
           "customer": "cus_NORMALIZED0001",
           "date": 1000000000,
@@ -881,7 +973,7 @@
             "unit_amount_decimal": "8000"
           },
           "proration": false,
-          "quantity": 6,
+          "quantity": 123,
           "subscription": null,
           "tax_rates": [],
           "test_clock": null,
@@ -889,13 +981,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OjJrADEQaroqDjstE7cqtqx",
+      "id": "evt_1OqSlwDEQaroqDjsmNZwJZN4",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "a89677b3-c566-4d7f-8a78-2786a3b6dce4"
+        "idempotency_key": "e9e54a11-f8f2-47ab-a310-45710807f6eb"
       },
       "type": "invoiceitem.created"
     },
@@ -918,7 +1010,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OjJqzDEQaroqDjs0FeKtB14",
+            "default_payment_method": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
             "footer": null,
             "rendering_options": null
           },
@@ -941,13 +1033,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OjJr9DEQaroqDjs5mRx70zt",
+      "id": "evt_1OqSlwDEQaroqDjsP50AYKUz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "a89677b3-c566-4d7f-8a78-2786a3b6dce4"
+        "idempotency_key": "e9e54a11-f8f2-47ab-a310-45710807f6eb"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.3.json
index 4656aa5633..d033ad4059 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.3.json
@@ -5,564 +5,294 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
+          "ach_credit_transfer": {
+            "account_number": "test_NORMALIZED02",
+            "bank_name": "TEST BANK",
+            "fingerprint": "NORMALIZED000002",
+            "refund_account_holder_name": null,
+            "refund_account_holder_type": null,
+            "refund_routing_number": null,
+            "routing_number": "110000000",
+            "swift_code": "TSTEZ122"
           },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
+          "amount": null,
+          "client_secret": "src_client_secret_NORMALIZED00000000000001",
           "created": 1000000000,
           "currency": "usd",
-          "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
+          "flow": "receiver",
+          "id": "src_NORMALIZED00000000000001",
           "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
+          "metadata": {},
+          "object": "source",
+          "owner": {
+            "address": null,
+            "email": "amount_0@stripe.com",
+            "name": null,
+            "phone": null,
+            "verified_address": null,
+            "verified_email": null,
+            "verified_name": null,
+            "verified_phone": null
           },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
+          "receiver": {
+            "address": "000000000-test_NORMALIZED01",
+            "amount_charged": 0,
+            "amount_received": 0,
+            "amount_returned": 0,
+            "refund_attributes_method": "email",
+            "refund_attributes_status": "missing"
           },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
+          "statement_descriptor": null,
+          "status": "pending",
+          "type": "ach_credit_transfer",
+          "usage": "reusable"
         }
       },
-      "id": "evt_1OjJrEDEQaroqDjsQGPN0gZz",
+      "id": "evt_1OqSlyDEQaroqDjsoiZXhxza",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "0b53583a-1fba-4661-b062-c6c5b63382a3"
+        "id": null,
+        "idempotency_key": "dd843bb8-a474-40d4-b334-7feab68953ba"
       },
-      "type": "invoice.payment_succeeded"
+      "type": "customer.source.created"
     },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
       "data": {
         "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
+          "address": null,
+          "balance": 0,
           "created": 1000000000,
           "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
+          "default_currency": "usd",
+          "default_source": "src_NORMALIZED00000000000001",
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
           "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
+            "footer": null,
+            "rendering_options": null
           },
           "livemode": false,
           "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
+            "realm_id": "1",
+            "realm_str": "zulip"
           },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OjJrDDEQaroqDjsWkPITsPA",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 2,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "0b53583a-1fba-4661-b062-c6c5b63382a3"
-      },
-      "type": "invoice.paid"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
+          "name": null,
+          "next_invoice_sequence": 2,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
         },
         "previous_attributes": {
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "attempt_count": 0,
-          "attempted": false,
-          "charge": null,
-          "paid": false,
-          "status": "open",
-          "status_transitions": {
-            "paid_at": null
-          }
+          "default_source": null
         }
       },
-      "id": "evt_1OjJrDDEQaroqDjsyfYyCJ2e",
+      "id": "evt_1OqSlzDEQaroqDjsx3cQiHr9",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "dd843bb8-a474-40d4-b334-7feab68953ba"
+      },
+      "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": true,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSlyDEQaroqDjsgx6k8YAy",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "0b53583a-1fba-4661-b062-c6c5b63382a3"
+        "idempotency_key": "f1927e55-a11b-44f6-94ca-eb13ce069808"
       },
-      "type": "invoice.updated"
+      "type": "invoice.paid"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.create.1.json
index caa6a772e8..be6f23a347 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.create.1.json
@@ -2,15 +2,15 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 48000,
+  "amount_due": 984000,
   "amount_paid": 0,
-  "amount_remaining": 48000,
+  "amount_remaining": 984000,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
   "attempt_count": 0,
   "attempted": false,
-  "auto_advance": false,
+  "auto_advance": true,
   "automatic_tax": {
     "enabled": false,
     "liability": null,
@@ -18,7 +18,7 @@
   },
   "billing_reason": "manual",
   "charge": null,
-  "collection_method": "charge_automatically",
+  "collection_method": "send_invoice",
   "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
@@ -36,7 +36,7 @@
   "description": null,
   "discount": null,
   "discounts": [],
-  "due_date": null,
+  "due_date": 1000000000,
   "effective_at": null,
   "ending_balance": null,
   "footer": null,
@@ -52,8 +52,8 @@
   "lines": {
     "data": [
       {
-        "amount": 48000,
-        "amount_excluding_tax": 48000,
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
         "currency": "usd",
         "description": "Zulip Cloud Standard",
         "discount_amounts": [],
@@ -95,7 +95,7 @@
         "proration_details": {
           "credited_items": null
         },
-        "quantity": 6,
+        "quantity": 123,
         "subscription": null,
         "tax_amounts": [],
         "tax_rates": [],
@@ -111,8 +111,8 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
-    "license_management": "automatic",
-    "licenses": "6",
+    "license_management": "manual",
+    "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
   },
@@ -156,14 +156,14 @@
   "subscription_details": {
     "metadata": null
   },
-  "subtotal": 48000,
-  "subtotal_excluding_tax": 48000,
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
   "tax": null,
   "test_clock": null,
-  "total": 48000,
+  "total": 984000,
   "total_discount_amounts": [],
-  "total_excluding_tax": 48000,
+  "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.finalize_invoice.1.json
index 43a452a9c2..d8b92812a0 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.finalize_invoice.1.json
@@ -2,15 +2,15 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 48000,
+  "amount_due": 984000,
   "amount_paid": 0,
-  "amount_remaining": 48000,
+  "amount_remaining": 984000,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
   "attempt_count": 0,
   "attempted": false,
-  "auto_advance": false,
+  "auto_advance": true,
   "automatic_tax": {
     "enabled": false,
     "liability": null,
@@ -18,7 +18,7 @@
   },
   "billing_reason": "manual",
   "charge": null,
-  "collection_method": "charge_automatically",
+  "collection_method": "send_invoice",
   "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
@@ -36,14 +36,14 @@
   "description": null,
   "discount": null,
   "discounts": [],
-  "due_date": null,
+  "due_date": 1000000000,
   "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM30200QOqRGA4B?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNQ0200x3TCLX7R?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM30200QOqRGA4B/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNQ0200x3TCLX7R/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -52,8 +52,8 @@
   "lines": {
     "data": [
       {
-        "amount": 48000,
-        "amount_excluding_tax": 48000,
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
         "currency": "usd",
         "description": "Zulip Cloud Standard",
         "discount_amounts": [],
@@ -95,7 +95,7 @@
         "proration_details": {
           "credited_items": null
         },
-        "quantity": 6,
+        "quantity": 123,
         "subscription": null,
         "tax_amounts": [],
         "tax_rates": [],
@@ -111,8 +111,8 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
-    "license_management": "automatic",
-    "licenses": "6",
+    "license_management": "manual",
+    "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
   },
@@ -156,14 +156,14 @@
   "subscription_details": {
     "metadata": null
   },
-  "subtotal": 48000,
-  "subtotal_excluding_tax": 48000,
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
   "tax": null,
   "test_clock": null,
-  "total": 48000,
+  "total": 984000,
   "total_discount_amounts": [],
-  "total_excluding_tax": 48000,
+  "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.pay.1.json
index b24cde9418..e9ed986ddc 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.pay.1.json
@@ -2,14 +2,14 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 48000,
-  "amount_paid": 48000,
-  "amount_remaining": 0,
+  "amount_due": 984000,
+  "amount_paid": 0,
+  "amount_remaining": 984000,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
-  "attempt_count": 1,
-  "attempted": true,
+  "attempt_count": 0,
+  "attempted": false,
   "auto_advance": false,
   "automatic_tax": {
     "enabled": false,
@@ -17,8 +17,8 @@
     "status": null
   },
   "billing_reason": "manual",
-  "charge": "ch_NORMALIZED00000000000001",
-  "collection_method": "charge_automatically",
+  "charge": null,
+  "collection_method": "send_invoice",
   "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
@@ -36,14 +36,14 @@
   "description": null,
   "discount": null,
   "discounts": [],
-  "due_date": null,
+  "due_date": 1000000000,
   "effective_at": 1000000000,
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUJWTVl5c0hsSHdXc1FlUmF6N3E4ZUJIMGhoLDk4MzYzMzM50200F8sA1snr/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PcGt5QWVEaXpmWkE2UU56TjR3Sk93djNjRHZQLDEwMDA2NTkwNg0200wjy1v78l/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -52,8 +52,8 @@
   "lines": {
     "data": [
       {
-        "amount": 48000,
-        "amount_excluding_tax": 48000,
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
         "currency": "usd",
         "description": "Zulip Cloud Standard",
         "discount_amounts": [],
@@ -95,7 +95,7 @@
         "proration_details": {
           "credited_items": null
         },
-        "quantity": 6,
+        "quantity": 123,
         "subscription": null,
         "tax_amounts": [],
         "tax_rates": [],
@@ -111,8 +111,8 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
-    "license_management": "automatic",
-    "licenses": "6",
+    "license_management": "manual",
+    "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
   },
@@ -121,8 +121,8 @@
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
-  "paid_out_of_band": false,
-  "payment_intent": "pi_NORMALIZED00000000000001",
+  "paid_out_of_band": true,
+  "payment_intent": null,
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
@@ -156,13 +156,13 @@
   "subscription_details": {
     "metadata": null
   },
-  "subtotal": 48000,
-  "subtotal_excluding_tax": 48000,
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
   "tax": null,
   "test_clock": null,
-  "total": 48000,
+  "total": 984000,
   "total_discount_amounts": [],
-  "total_excluding_tax": 48000,
+  "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
   "webhooks_delivered_at": 1000000000
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--InvoiceItem.create.1.json
index 23f69ee2e0..40cfc90def 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--InvoiceItem.create.1.json
@@ -1,5 +1,5 @@
 {
-  "amount": 48000,
+  "amount": 984000,
   "currency": "usd",
   "customer": "cus_NORMALIZED0001",
   "date": 1000000000,
@@ -38,7 +38,7 @@
     "unit_amount_decimal": "8000"
   },
   "proration": false,
-  "quantity": 6,
+  "quantity": 123,
   "subscription": null,
   "tax_rates": [],
   "test_clock": null,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.create.1.json
index ebeb0f9b63..b408f1208b 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OjJqzDEQaroqDjsEMSoKONi_secret_PYQiYa36Hi2d9jFjeXSVqVW36e53HQL",
+  "client_secret": "seti_1OqSlrDEQaroqDjs3pZSE4bF_secret_PfoO9xgeDtFiurNqtojBOlbs5wVgkR9",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OjJqzDEQaroqDjsEMSoKONi",
+  "id": "seti_1OqSlrDEQaroqDjs3pZSE4bF",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OjJqzDEQaroqDjsiEOIz94h",
+  "latest_attempt": "setatt_1OqSlrDEQaroqDjscV4OYbOK",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OjJqzDEQaroqDjs0FeKtB14",
+  "payment_method": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.list.1.json
index 88e515a140..9b39a6d799 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OjJqxDEQaroqDjsUwdKoI2T_secret_PYQiTjvhK2Kh6AMNeqyoxxZXkpsNKNz",
+      "client_secret": "seti_1OqSlqDEQaroqDjscUk6Rzjc_secret_PfoOBai5Pqd67fJDS065OwveTJ6hLi7",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OjJqxDEQaroqDjsUwdKoI2T",
+      "id": "seti_1OqSlqDEQaroqDjscUk6Rzjc",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.retrieve.1.json
index ebeb0f9b63..b408f1208b 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OjJqzDEQaroqDjsEMSoKONi_secret_PYQiYa36Hi2d9jFjeXSVqVW36e53HQL",
+  "client_secret": "seti_1OqSlrDEQaroqDjs3pZSE4bF_secret_PfoO9xgeDtFiurNqtojBOlbs5wVgkR9",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OjJqzDEQaroqDjsEMSoKONi",
+  "id": "seti_1OqSlrDEQaroqDjs3pZSE4bF",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OjJqzDEQaroqDjsiEOIz94h",
+  "latest_attempt": "setatt_1OqSlrDEQaroqDjscV4OYbOK",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OjJqzDEQaroqDjs0FeKtB14",
+  "payment_method": "pm_1OqSlrDEQaroqDjsbsgfPpu3",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.1.json
index cacaf9b62c..705decb924 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.1.json
@@ -46,7 +46,7 @@
       "proration_behavior": "none"
     }
   },
-  "id": "bpc_1OjJr5DEQaroqDjsD8LS4MNX",
+  "id": "bpc_1OqSltDEQaroqDjsRJvbsMzN",
   "is_default": false,
   "livemode": false,
   "login_page": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.2.json
index eae099d4cb..3762bbcaa3 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.2.json
@@ -46,7 +46,7 @@
       "proration_behavior": "none"
     }
   },
-  "id": "bpc_1OjJrEDEQaroqDjsExND5S6B",
+  "id": "bpc_1OqSm0DEQaroqDjs9Det88Wq",
   "is_default": false,
   "livemode": false,
   "login_page": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.3.json
index 432efb31ed..17567188a9 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.3.json
@@ -43,7 +43,7 @@
       "proration_behavior": "none"
     }
   },
-  "id": "bpc_1OjJrFDEQaroqDjscpxrDOV3",
+  "id": "bpc_1OqSm1DEQaroqDjsxv3SWCVK",
   "is_default": false,
   "livemode": false,
   "login_page": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.1.json
index 4d7cef35f9..8a320ac3b4 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.1.json
@@ -1,13 +1,13 @@
 {
-  "configuration": "bpc_1OjJr5DEQaroqDjsD8LS4MNX",
+  "configuration": "bpc_1OqSltDEQaroqDjsRJvbsMzN",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "flow": null,
-  "id": "bps_1OjJr6DEQaroqDjsZtwAM2Yq",
+  "id": "bps_1OqSluDEQaroqDjsVBSEItfj",
   "livemode": false,
   "locale": null,
   "object": "billing_portal.session",
   "on_behalf_of": null,
-  "return_url": "http://zulip.testserver/upgrade/?manual_license_management=false&tier=1",
-  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpYmhWclkwTGVQTG5PNHdrRGpjaDg5cnlsM2s30100Tb4hCv8z"
+  "return_url": "http://zulip.testserver/upgrade/?manual_license_management=false&tier=1&setup_payment_by_invoice=false",
+  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PNUxkSXgzM04wWTVNWjdrWmpsNXdlamw0NnJp0100nIF1RFtw"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.2.json
index e2d47129f2..6c07ead76a 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.2.json
@@ -1,13 +1,13 @@
 {
-  "configuration": "bpc_1OjJrEDEQaroqDjsExND5S6B",
+  "configuration": "bpc_1OqSm0DEQaroqDjs9Det88Wq",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "flow": null,
-  "id": "bps_1OjJrFDEQaroqDjsSIyoIIxB",
+  "id": "bps_1OqSm0DEQaroqDjs0YhfqK3z",
   "livemode": false,
   "locale": null,
   "object": "billing_portal.session",
   "on_behalf_of": null,
   "return_url": "http://zulip.testserver/billing/",
-  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpcUtCMHhGektBNVlNNGRuNHVFVW1pVzB0Z3Fl01000aC3iwNX"
+  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PWjZDVFBycm1Jd1VPRXMzdGF6bHVhTm9PU1o301005LySq9lv"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.3.json
index 820217671b..0588a90625 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.3.json
@@ -1,13 +1,13 @@
 {
-  "configuration": "bpc_1OjJrFDEQaroqDjscpxrDOV3",
+  "configuration": "bpc_1OqSm1DEQaroqDjsxv3SWCVK",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "flow": null,
-  "id": "bps_1OjJrGDEQaroqDjsliqRaUpe",
+  "id": "bps_1OqSm1DEQaroqDjs5LBqDkYa",
   "livemode": false,
   "locale": null,
   "object": "billing_portal.session",
   "on_behalf_of": null,
   "return_url": "http://zulip.testserver/billing/",
-  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFpbGV4a2tnN0wyeFNTQThiZDFhalJNdjdjZjQw0100aqFy16Up"
+  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PajNac1RmcElPV254dE1xSWZhcmRpU1lZdlln010069BMeMLN"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.create.1.json
index 2db7eaa513..3c4aa4249c 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02Y0Ew379OrvfS5ZKGMRcGM9FxHG5gpTTBxIVPIGCv9ysEKV",
+  "id": "cs_test_NORMALIZED03WkZORZPjuOPm4yNPEre11WU5T0ikgdcZPJXBSi7jQI8gJE",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OjJqxDEQaroqDjsUwdKoI2T",
+  "setup_intent": "seti_1OqSlqDEQaroqDjscUk6Rzjc",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Y0Ew379OrvfS5ZKGMRcGM9FxHG5gpTTBxIVPIGCv9ysEKV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03WkZORZPjuOPm4yNPEre11WU5T0ikgdcZPJXBSi7jQI8gJE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.list.1.json
index 5279fb41a9..cfa683cf0e 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02Y0Ew379OrvfS5ZKGMRcGM9FxHG5gpTTBxIVPIGCv9ysEKV",
+      "id": "cs_test_NORMALIZED03WkZORZPjuOPm4yNPEre11WU5T0ikgdcZPJXBSi7jQI8gJE",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OjJqxDEQaroqDjsUwdKoI2T",
+      "setup_intent": "seti_1OqSlqDEQaroqDjscUk6Rzjc",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Y0Ew379OrvfS5ZKGMRcGM9FxHG5gpTTBxIVPIGCv9ysEKV#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED03WkZORZPjuOPm4yNPEre11WU5T0ikgdcZPJXBSi7jQI8gJE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.create.1.json
index 804c8d9173..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver b5d583a5-c7c",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.modify.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.modify.1.json
index efa8ef4c00..922c9f2fba 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver b5d583a5-c7c",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+    "default_payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.1.json
index f88fec01e8..225af0616f 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver b5d583a5-c7c",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+      "id": "pm_1OqSqBDEQaroqDjswKb0vt3L",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.2.json
index f88fec01e8..225af0616f 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver b5d583a5-c7c",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+      "id": "pm_1OqSqBDEQaroqDjswKb0vt3L",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.3.json
index f88fec01e8..225af0616f 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver b5d583a5-c7c",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+      "id": "pm_1OqSqBDEQaroqDjswKb0vt3L",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.4.json
index f88fec01e8..225af0616f 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver b5d583a5-c7c",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+      "id": "pm_1OqSqBDEQaroqDjswKb0vt3L",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.1.json
index 194380f9c9..16fff081ae 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver b5d583a5-c7c",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+            "default_payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OjJt2DEQaroqDjsuKaDfSOe",
+      "id": "evt_1OqSqDDEQaroqDjsDsGkVpUH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "b6b5c92c-bee9-4c51-9127-07a2bf0b048d"
+        "idempotency_key": "f4d01ed3-4cb3-4fe4-a0f2-1b5ab7ac870d"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.2.json
index 64978efd51..758cfce831 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.2.json
@@ -1,251 +1,5 @@
 {
   "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 176000,
-          "amount_paid": 176000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -24000,
-                "amount_excluding_tax": -24000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -24000,
-                  "unit_amount_decimal": "-24000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-24000"
-              },
-              {
-                "amount": 200000,
-                "amount_excluding_tax": 200000,
-                "currency": "usd",
-                "description": "Zulip Business",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice": "in_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 25,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "25",
-            "plan_tier": "104"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0001",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Business",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 176000,
-          "subtotal_excluding_tax": 176000,
-          "tax": null,
-          "test_clock": null,
-          "total": 176000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 176000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        },
-        "previous_attributes": {
-          "amount_paid": 0,
-          "amount_remaining": 176000,
-          "attempt_count": 0,
-          "attempted": false,
-          "charge": null,
-          "paid": false,
-          "status": "open",
-          "status_transitions": {
-            "paid_at": null
-          }
-        }
-      },
-      "id": "evt_1OjJtDDEQaroqDjs4OPPTzy9",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "eb3c1365-d380-4336-b7f7-7af8cbe53162"
-      },
-      "type": "invoice.updated"
-    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -316,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+                "payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 176000,
@@ -327,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -359,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMecra4GMga3Dsq0IKk6LBa5_tHnSll1qcgrDnJ9yVEpbNoW10NXTybl6SC__pcUxDhkcm5J-c9PQOd8?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKP6Sla8GMgaSpOkQFI86LBYV7iyKgF1m8n_cDfLAMxpP_-MxTzzWoO_fMrKvv2H0m3yXrvd8-zUHmvGJ?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -384,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_OT0rY62bTwPJoaA21ukRc5Qq6",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_rXOs9KVtYRDiCe8vdYtHKvg6d",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -399,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+          "payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -427,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OjJt9DEQaroqDjs1hk7DULo",
+      "id": "evt_3OqSqGDEQaroqDjs1n0sRG00",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "eb3c1365-d380-4336-b7f7-7af8cbe53162"
+        "idempotency_key": "083a9811-7e88-4455-93a4-8b2401b32165"
       },
       "type": "payment_intent.succeeded"
     },
@@ -492,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+          "payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
           "payment_method_details": {
             "card": {
               "amount_authorized": 176000,
@@ -503,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -535,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMecra4GMgYuthlcwZI6LBa_a5Uz8es84Pjx0bfVHqu3swMSOgHJeqc_-yYEvczJkk-13PaSpKg6Be4a?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKP-Sla8GMgZeoHNcokY6LBa_uEUdj4PWgH8u1G50jp2ACLiL11bBEWByplh8qCuZGVBgRU_5z77TXeWk?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -555,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OjJt9DEQaroqDjs1o4OJfRp",
+      "id": "evt_3OqSqGDEQaroqDjs1Wf7KwDo",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "eb3c1365-d380-4336-b7f7-7af8cbe53162"
+        "idempotency_key": "083a9811-7e88-4455-93a4-8b2401b32165"
       },
       "type": "charge.succeeded"
     },
@@ -612,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYw0200ZjQ7gGZI?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3Mw0200hn6KtpB7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYw0200ZjQ7gGZI/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3Mw0200hn6KtpB7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -789,13 +543,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJtADEQaroqDjsdaqkoQbF",
+      "id": "evt_1OqSqHDEQaroqDjsVIxuc8OV",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "b01b6be4-e946-436e-b152-1e21aaff9fd2"
+        "idempotency_key": "1e713102-90a6-46dd-81ec-51d8a1048d52"
       },
       "type": "invoice.finalized"
     },
@@ -846,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDU50200ttvDg13S?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3Mw0200hn6KtpB7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDU50200ttvDg13S/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3Mw0200hn6KtpB7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -1040,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OjJtADEQaroqDjsoc9FfyVN",
+      "id": "evt_1OqSqHDEQaroqDjs4ujd8TXH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "b01b6be4-e946-436e-b152-1e21aaff9fd2"
+        "idempotency_key": "1e713102-90a6-46dd-81ec-51d8a1048d52"
       },
       "type": "invoice.updated"
     },
@@ -1074,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_OT0rY62bTwPJoaA21ukRc5Qq6",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_rXOs9KVtYRDiCe8vdYtHKvg6d",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -1117,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OjJt9DEQaroqDjs1IeW3Kdp",
+      "id": "evt_3OqSqGDEQaroqDjs1dvjHJVy",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "b01b6be4-e946-436e-b152-1e21aaff9fd2"
+        "idempotency_key": "1e713102-90a6-46dd-81ec-51d8a1048d52"
       },
       "type": "payment_intent.created"
     },
@@ -1348,16 +1102,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJt7DEQaroqDjs5WdrbG0s",
+      "id": "evt_1OqSqGDEQaroqDjsmMNKp9kq",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "7d997514-a7bc-474c-af0b-e1786d9c21a4"
+        "idempotency_key": "0b29cc22-6c50-487d-abb5-d9d9f097c267"
       },
       "type": "invoice.created"
     },
@@ -1413,13 +1167,13 @@
           "unit_amount_decimal": "-24000"
         }
       },
-      "id": "evt_1OjJt5DEQaroqDjsOtAcbErp",
+      "id": "evt_1OqSqFDEQaroqDjsBrE63xXW",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "f6fd0bda-4c11-4680-9c31-4aca82d30ef1"
+        "idempotency_key": "a8238c0f-fbbb-44b9-bcb0-a82ea61cf3ee"
       },
       "type": "invoiceitem.created"
     },
@@ -1475,13 +1229,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OjJt4DEQaroqDjsjS1KonFk",
+      "id": "evt_1OqSqFDEQaroqDjsvjGX5xfM",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "129724b1-dad1-4eb0-a694-9726896030fe"
+        "idempotency_key": "ddf4d8dd-9051-4646-ac95-2dc3072d842f"
       },
       "type": "invoiceitem.created"
     },
@@ -1497,21 +1251,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver b5d583a5-c7c",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+            "default_payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "b5d583a5-c7cf-4f26-9b15-5cff5fbf948c"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1527,18 +1281,18 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OjJt4DEQaroqDjsAlPiqaIo",
+      "id": "evt_1OqSqFDEQaroqDjsikdCSRgI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "129724b1-dad1-4eb0-a694-9726896030fe"
+        "idempotency_key": "ddf4d8dd-9051-4646-ac95-2dc3072d842f"
       },
       "type": "customer.updated"
     }
   ],
-  "has_more": true,
+  "has_more": false,
   "object": "list",
   "url": "/v1/events"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.3.json
index 496efc3ccc..48a4db185e 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NQ0200904i5wvk?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NQ0200904i5wvk/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -224,13 +224,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJtDDEQaroqDjs5DOuydjq",
+      "id": "evt_1OqSqJDEQaroqDjsTtwPF9Vu",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "eb3c1365-d380-4336-b7f7-7af8cbe53162"
+        "idempotency_key": "083a9811-7e88-4455-93a4-8b2401b32165"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -281,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NQ0200904i5wvk?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NQ0200904i5wvk/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -458,15 +458,261 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJtDDEQaroqDjsrzdBEIg2",
+      "id": "evt_1OqSqJDEQaroqDjsO2Ag2oVU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "eb3c1365-d380-4336-b7f7-7af8cbe53162"
+        "idempotency_key": "083a9811-7e88-4455-93a4-8b2401b32165"
       },
       "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 176000,
+          "amount_paid": 176000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NQ0200904i5wvk?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NQ0200904i5wvk/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -24000,
+                "amount_excluding_tax": -24000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -24000,
+                  "unit_amount_decimal": "-24000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-24000"
+              },
+              {
+                "amount": 200000,
+                "amount_excluding_tax": 200000,
+                "currency": "usd",
+                "description": "Zulip Business",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 25,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "25",
+            "plan_tier": "104"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Business",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 176000,
+          "subtotal_excluding_tax": 176000,
+          "tax": null,
+          "test_clock": null,
+          "total": 176000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 176000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "amount_paid": 0,
+          "amount_remaining": 176000,
+          "attempt_count": 0,
+          "attempted": false,
+          "charge": null,
+          "paid": false,
+          "status": "open",
+          "status_transitions": {
+            "paid_at": null
+          }
+        }
+      },
+      "id": "evt_1OqSqJDEQaroqDjsltx4Sb90",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "083a9811-7e88-4455-93a4-8b2401b32165"
+      },
+      "type": "invoice.updated"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.create.1.json
index 959f59a7ca..871a278cdc 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.create.1.json
@@ -215,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.finalize_invoice.1.json
index 837f71dbf3..3d7083c150 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDU50200ttvDg13S?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3Mw0200hn6KtpB7?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDU50200ttvDg13S/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3Mw0200hn6KtpB7/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.pay.1.json
index 1ec5030ef9..64b8cd397f 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NA0200K19gQtDy?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrZVlCYmhNZGRuVzdwdWUzN2xXWG5yUWs4alVCLDk4MzYzNDYz0200QOxqChvT/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UcHZ4WjRzWFZ5TnZwVEdwT05RYVFpdHIwbHg3LDEwMDA2NjE3NA0200K19gQtDy/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.create.1.json
index bdbdb75ff1..9d4792e31a 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OjJt0DEQaroqDjsRzphUz5J_secret_PYQkcIrSMDPvm3M4OFyQNiYyoM6EJcL",
+  "client_secret": "seti_1OqSqBDEQaroqDjsqxVNWtIx_secret_PfoTOTxyOoti9Ox5zsiC4oRT7IQpocv",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OjJt0DEQaroqDjsRzphUz5J",
+  "id": "seti_1OqSqBDEQaroqDjsqxVNWtIx",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OjJt0DEQaroqDjsZtTGWSeJ",
+  "latest_attempt": "setatt_1OqSqBDEQaroqDjs8t8WRwXp",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+  "payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.list.1.json
index 16cb61137e..e46c411c73 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OjJsxDEQaroqDjsc9pOQ2LO_secret_PYQk8rG4ZExj86FhedjHioMSZ3ZQ8Zw",
+      "client_secret": "seti_1OqSqADEQaroqDjs3mQi267N_secret_PfoTZxX9ICxhy0PAvtHWy8OtWr6b3hN",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OjJsxDEQaroqDjsc9pOQ2LO",
+      "id": "seti_1OqSqADEQaroqDjs3mQi267N",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.retrieve.1.json
index bdbdb75ff1..9d4792e31a 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OjJt0DEQaroqDjsRzphUz5J_secret_PYQkcIrSMDPvm3M4OFyQNiYyoM6EJcL",
+  "client_secret": "seti_1OqSqBDEQaroqDjsqxVNWtIx_secret_PfoTOTxyOoti9Ox5zsiC4oRT7IQpocv",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OjJt0DEQaroqDjsRzphUz5J",
+  "id": "seti_1OqSqBDEQaroqDjsqxVNWtIx",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OjJt0DEQaroqDjsZtTGWSeJ",
+  "latest_attempt": "setatt_1OqSqBDEQaroqDjs8t8WRwXp",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OjJt0DEQaroqDjsU7iykjQH",
+  "payment_method": "pm_1OqSqBDEQaroqDjswKb0vt3L",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.1.json
index bb39105434..afc78a1f50 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.1.json
@@ -43,7 +43,7 @@
       "proration_behavior": "none"
     }
   },
-  "id": "bpc_1OjJtGDEQaroqDjsa9YSm95i",
+  "id": "bpc_1OqSqKDEQaroqDjsaVHYnBRs",
   "is_default": false,
   "livemode": false,
   "login_page": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.2.json
index 981a577223..effb25c602 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.2.json
@@ -46,7 +46,7 @@
       "proration_behavior": "none"
     }
   },
-  "id": "bpc_1OjJtHDEQaroqDjsVWnhcYho",
+  "id": "bpc_1OqSqLDEQaroqDjst6V6S14k",
   "is_default": false,
   "livemode": false,
   "login_page": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.1.json
index 6536898a9b..1a19755a33 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.1.json
@@ -1,13 +1,13 @@
 {
-  "configuration": "bpc_1OjJtGDEQaroqDjsa9YSm95i",
+  "configuration": "bpc_1OqSqKDEQaroqDjsaVHYnBRs",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "flow": null,
-  "id": "bps_1OjJtGDEQaroqDjsdLRcmFS1",
+  "id": "bps_1OqSqKDEQaroqDjs3BARnFxx",
   "livemode": false,
   "locale": null,
   "object": "billing_portal.session",
   "on_behalf_of": null,
-  "return_url": "http://selfhosting.testserver/realm/b5d583a5-c7cf-4f26-9b15-5cff5fbf948c/billing/",
-  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFreWNTaVBMRXNjOVVxbmlRZ2h4aTBCUXU5RGdr0100cEA5ZMhK"
+  "return_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/",
+  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UY2k0bG85VWVrNDhZUFUzdjBWQzl3SEpiWkFx0100WTKPpAjB"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.2.json
index 556779d9df..9591850019 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.2.json
@@ -1,13 +1,13 @@
 {
-  "configuration": "bpc_1OjJtHDEQaroqDjsVWnhcYho",
+  "configuration": "bpc_1OqSqLDEQaroqDjst6V6S14k",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "flow": null,
-  "id": "bps_1OjJtHDEQaroqDjsLtIO1zGu",
+  "id": "bps_1OqSqLDEQaroqDjshi6bIkxV",
   "livemode": false,
   "locale": null,
   "object": "billing_portal.session",
   "on_behalf_of": null,
-  "return_url": "http://selfhosting.testserver/realm/b5d583a5-c7cf-4f26-9b15-5cff5fbf948c/billing/",
-  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFrd1JCTHNuYVpma0dIOUtoT1RVT2o0eGhYMDJm0100oLtdAJdW"
+  "return_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/",
+  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UR1FPZTJsWnNRN3ViZG0wak95TFFrZXM0QTFI0100mDkz7335"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.create.1.json
index ee097a4881..eb14516d24 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/b5d583a5-c7cf-4f26-9b15-5cff5fbf948c/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02OLqkTvpRtgN3FWbmhMaReL2hL25q5hvjEuIp42bbwM74oI",
+  "id": "cs_test_NORMALIZED02ptvzIQpnkDr2DFSXkFVFFqxBBf8TuawKkfIOxM1o84my9w",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "1",
+    "remote_realm_user_id": "10",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OjJsxDEQaroqDjsc9pOQ2LO",
+  "setup_intent": "seti_1OqSqADEQaroqDjs3mQi267N",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/b5d583a5-c7cf-4f26-9b15-5cff5fbf948c/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02OLqkTvpRtgN3FWbmhMaReL2hL25q5hvjEuIp42bbwM74oI#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02ptvzIQpnkDr2DFSXkFVFFqxBBf8TuawKkfIOxM1o84my9w#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.list.1.json
index 776c52fac8..bbdc7a1749 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/b5d583a5-c7cf-4f26-9b15-5cff5fbf948c/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02OLqkTvpRtgN3FWbmhMaReL2hL25q5hvjEuIp42bbwM74oI",
+      "id": "cs_test_NORMALIZED02ptvzIQpnkDr2DFSXkFVFFqxBBf8TuawKkfIOxM1o84my9w",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "1",
+        "remote_realm_user_id": "10",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OjJsxDEQaroqDjsc9pOQ2LO",
+      "setup_intent": "seti_1OqSqADEQaroqDjs3mQi267N",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/b5d583a5-c7cf-4f26-9b15-5cff5fbf948c/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02OLqkTvpRtgN3FWbmhMaReL2hL25q5hvjEuIp42bbwM74oI#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02ptvzIQpnkDr2DFSXkFVFFqxBBf8TuawKkfIOxM1o84my9w#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.modify.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.modify.1.json
index fc09e813b1..c336c4a933 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+    "default_payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.1.json
index c454c3130b..5026b66d27 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+      "id": "pm_1OqSsnDEQaroqDjswUjkkmJd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.2.json
index c454c3130b..5026b66d27 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+      "id": "pm_1OqSsnDEQaroqDjswUjkkmJd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.3.json
index c454c3130b..5026b66d27 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+      "id": "pm_1OqSsnDEQaroqDjswUjkkmJd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.4.json
index c454c3130b..5026b66d27 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+      "id": "pm_1OqSsnDEQaroqDjswUjkkmJd",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.1.json
index ce0974ea14..389e74300f 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+            "default_payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OjJu8DEQaroqDjsAi9SycfE",
+      "id": "evt_1OqSspDEQaroqDjsh6gGoTXb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "b03e8ab6-af92-4f4e-8cad-405051f2900f"
+        "idempotency_key": "7604a949-4dd3-47b0-9665-f61a52da5434"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.2.json
index dbd18f337a..03ffb3dbb5 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+                "payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 176000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKIudra4GMgbyHlBHcis6LBZKfEoTG1cstnjHtlR0_biGowiadDypJNJqadAfIG6egyiUKDKiExY1hJmV?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKGUla8GMgZViw5cO9Q6LBY6edev3xaQyCb6DfaVQ5uuQJKciXj3tB5IuXAv48ZFn_I7SIfdLBrGzkKF?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_wrXl2OlMgOhazqWjYfee5fsmm",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_h1SS4wWrtxlXg1dbzqNduqgvO",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+          "payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OjJuGDEQaroqDjs07MNV53p",
+      "id": "evt_3OqSstDEQaroqDjs0eJXn11Z",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "114fcd56-e8b8-4c52-92e9-3cb3d49fa08d"
+        "idempotency_key": "5e92f2ab-e560-415a-aa15-f92dac3a3aac"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+          "payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
           "payment_method_details": {
             "card": {
               "amount_authorized": 176000,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKIudra4GMgYiQXDrE2U6LBZ1STqDIIpvjuXT3ZUQ6qpMSL2Qk1ddPcKmjAHmvvZZFbSeFhgTsMw6KS_R?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKGUla8GMgY5QY-nV7g6LBYbtId7fACe2E6vU78Ao6Z8KbonMPmtkKCXz2G5Q3Tpul3edWyc__MVZxpj?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OjJuGDEQaroqDjs0tridJuF",
+      "id": "evt_3OqSstDEQaroqDjs02MVT45o",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "114fcd56-e8b8-4c52-92e9-3cb3d49fa08d"
+        "idempotency_key": "5e92f2ab-e560-415a-aa15-f92dac3a3aac"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTI40200EGz3AXPl?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNQ0200xSS8OhY6?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTI40200EGz3AXPl/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNQ0200xSS8OhY6/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -540,16 +540,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJuHDEQaroqDjsOH97CMUw",
+      "id": "evt_1OqSstDEQaroqDjs768FZxUy",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "05e54d67-15e2-4864-bf1e-7fea05d207c8"
+        "idempotency_key": "12bf10ad-4a30-49e1-a7d2-d31afd8cb5b4"
       },
       "type": "invoice.finalized"
     },
@@ -600,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTI40200EGz3AXPl?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNQ0200xSS8OhY6?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTI40200EGz3AXPl/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNQ0200xSS8OhY6/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -774,7 +774,7 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -794,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OjJuGDEQaroqDjsKs1vK9Lb",
+      "id": "evt_1OqSstDEQaroqDjsRhd7ruls",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "05e54d67-15e2-4864-bf1e-7fea05d207c8"
+        "idempotency_key": "12bf10ad-4a30-49e1-a7d2-d31afd8cb5b4"
       },
       "type": "invoice.updated"
     },
@@ -828,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_wrXl2OlMgOhazqWjYfee5fsmm",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_h1SS4wWrtxlXg1dbzqNduqgvO",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -871,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OjJuGDEQaroqDjs0gG91yaB",
+      "id": "evt_3OqSstDEQaroqDjs0jyuCNcz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "05e54d67-15e2-4864-bf1e-7fea05d207c8"
+        "idempotency_key": "12bf10ad-4a30-49e1-a7d2-d31afd8cb5b4"
       },
       "type": "payment_intent.created"
     },
@@ -1102,16 +1102,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJuFDEQaroqDjsJg2sQLiH",
+      "id": "evt_1OqSssDEQaroqDjs9YkJnPfb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "efb08fb4-78ea-45f6-b94f-6e8b09590617"
+        "idempotency_key": "49435df4-3513-470f-920a-754cf2f065f9"
       },
       "type": "invoice.created"
     },
@@ -1167,13 +1167,13 @@
           "unit_amount_decimal": "-24000"
         }
       },
-      "id": "evt_1OjJuFDEQaroqDjsHxA5nznb",
+      "id": "evt_1OqSssDEQaroqDjscxzJjWNG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "97520852-0961-4272-baed-cde11324c47b"
+        "idempotency_key": "e59a673a-145a-4659-ab8a-b1837034db9b"
       },
       "type": "invoiceitem.created"
     },
@@ -1229,13 +1229,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OjJuDDEQaroqDjsBEhDOLY2",
+      "id": "evt_1OqSssDEQaroqDjsZGeUipuW",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "abacc273-90d3-4887-b429-0a68b1efe5c8"
+        "idempotency_key": "62182c50-108b-411c-999e-117ee3820ae4"
       },
       "type": "invoiceitem.created"
     },
@@ -1258,7 +1258,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+            "default_payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
             "footer": null,
             "rendering_options": null
           },
@@ -1281,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OjJuDDEQaroqDjsHIZicwjR",
+      "id": "evt_1OqSsrDEQaroqDjsp9WomsHQ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "abacc273-90d3-4887-b429-0a68b1efe5c8"
+        "idempotency_key": "62182c50-108b-411c-999e-117ee3820ae4"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.3.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.3.json
index 404af8d14c..f79759c0b0 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMx0200jbU6k0V1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMx0200jbU6k0V1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -224,13 +224,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJuJDEQaroqDjsDPXd3Io2",
+      "id": "evt_1OqSsvDEQaroqDjsrnnk0dpW",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "114fcd56-e8b8-4c52-92e9-3cb3d49fa08d"
+        "idempotency_key": "5e92f2ab-e560-415a-aa15-f92dac3a3aac"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -281,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMx0200jbU6k0V1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMx0200jbU6k0V1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -458,13 +458,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OjJuJDEQaroqDjsY5k2hcaN",
+      "id": "evt_1OqSsvDEQaroqDjsRVdiQLnZ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "114fcd56-e8b8-4c52-92e9-3cb3d49fa08d"
+        "idempotency_key": "5e92f2ab-e560-415a-aa15-f92dac3a3aac"
       },
       "type": "invoice.paid"
     },
@@ -515,9 +515,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMx0200jbU6k0V1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMx0200jbU6k0V1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -704,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OjJuJDEQaroqDjsBtylKqs7",
+      "id": "evt_1OqSsvDEQaroqDjsPiKeMF75",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "114fcd56-e8b8-4c52-92e9-3cb3d49fa08d"
+        "idempotency_key": "5e92f2ab-e560-415a-aa15-f92dac3a3aac"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.create.1.json
index 959f59a7ca..871a278cdc 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.create.1.json
@@ -215,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.finalize_invoice.1.json
index fe190de295..8b003b44ea 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTI40200EGz3AXPl?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNQ0200xSS8OhY6?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTI40200EGz3AXPl/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNQ0200xSS8OhY6/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -215,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.pay.1.json
index 756be09e87..66f0639df1 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMw02000VgcfgpW?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsVk55S1FSMXVBNFdCbmkwemhHV1dOMUxYY0g3LDk4MzYzNTMw02000VgcfgpW/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WdGJQYWh1VmV4b1NQNXVmczdnbjU0NnhVWDZILDEwMDA2NjMzNw0200xSHSCxl7/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.create.1.json
index e4e257719a..90f85e835c 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OjJu4DEQaroqDjs0ZnrE7tn_secret_PYQlzk6Rx9ZYKuL4bmOXUYN7nB66MO8",
+  "client_secret": "seti_1OqSsnDEQaroqDjshBrYf7zU_secret_PfoVnFSj8DXwdjqg2CZY5sj8JhnVcZM",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OjJu4DEQaroqDjs0ZnrE7tn",
+  "id": "seti_1OqSsnDEQaroqDjshBrYf7zU",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OjJu4DEQaroqDjsfKVVgWFq",
+  "latest_attempt": "setatt_1OqSsnDEQaroqDjsUIyc1zpY",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+  "payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.list.1.json
index 83c566879d..62b3475710 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OjJu2DEQaroqDjscA5roWNx_secret_PYQlUa5vJs8J0TUyNSVrGuhz0y2ZAjo",
+      "client_secret": "seti_1OqSsnDEQaroqDjslbbzv81Z_secret_PfoVf2sfQVt3wuAesGtE6XWSz8BcigO",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OjJu2DEQaroqDjscA5roWNx",
+      "id": "seti_1OqSsnDEQaroqDjslbbzv81Z",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.retrieve.1.json
index e4e257719a..90f85e835c 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OjJu4DEQaroqDjs0ZnrE7tn_secret_PYQlzk6Rx9ZYKuL4bmOXUYN7nB66MO8",
+  "client_secret": "seti_1OqSsnDEQaroqDjshBrYf7zU_secret_PfoVnFSj8DXwdjqg2CZY5sj8JhnVcZM",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OjJu4DEQaroqDjs0ZnrE7tn",
+  "id": "seti_1OqSsnDEQaroqDjshBrYf7zU",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OjJu4DEQaroqDjsfKVVgWFq",
+  "latest_attempt": "setatt_1OqSsnDEQaroqDjsUIyc1zpY",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OjJu4DEQaroqDjsyCSC5PIN",
+  "payment_method": "pm_1OqSsnDEQaroqDjswUjkkmJd",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.1.json
index 8aab948644..0316af9550 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.1.json
@@ -43,7 +43,7 @@
       "proration_behavior": "none"
     }
   },
-  "id": "bpc_1OjJuMDEQaroqDjs4u2keGra",
+  "id": "bpc_1OqSsxDEQaroqDjsHCibYWsI",
   "is_default": false,
   "livemode": false,
   "login_page": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.2.json
index 7bc4d6b2b7..f8bbbccb2b 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.2.json
@@ -46,7 +46,7 @@
       "proration_behavior": "none"
     }
   },
-  "id": "bpc_1OjJuODEQaroqDjsC8ZIgLoM",
+  "id": "bpc_1OqSsxDEQaroqDjs33oIY33m",
   "is_default": false,
   "livemode": false,
   "login_page": {
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.1.json
index 271277c41c..f03b39a245 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.1.json
@@ -1,13 +1,13 @@
 {
-  "configuration": "bpc_1OjJuMDEQaroqDjs4u2keGra",
+  "configuration": "bpc_1OqSsxDEQaroqDjsHCibYWsI",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "flow": null,
-  "id": "bps_1OjJuNDEQaroqDjs4cxLNIY0",
+  "id": "bps_1OqSsxDEQaroqDjsajKd2QYq",
   "livemode": false,
   "locale": null,
   "object": "billing_portal.session",
   "on_behalf_of": null,
   "return_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/",
-  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsRGFhTElkQWlXdUtpU0lUNDZVVDZCNXUzdWlR0100Oop5Cc2L"
+  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9WMkNEUXhUNXhyUmtMM1liekZvNGZvekxvYnpl01004gicKOT5"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.2.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.2.json
index 7bfacacd7a..211075c9f7 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.2.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.2.json
@@ -1,13 +1,13 @@
 {
-  "configuration": "bpc_1OjJuODEQaroqDjsC8ZIgLoM",
+  "configuration": "bpc_1OqSsxDEQaroqDjs33oIY33m",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "flow": null,
-  "id": "bps_1OjJuPDEQaroqDjsZb1xFOPc",
+  "id": "bps_1OqSsyDEQaroqDjsg7Mf6FTf",
   "livemode": false,
   "locale": null,
   "object": "billing_portal.session",
   "on_behalf_of": null,
   "return_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/",
-  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QWVFsTkNQV3BNbXlVVFM5SVRwMm1icU9Uc1hhR1ly01000hB6h2dF"
+  "url": "https://billing.stripe.com/p/session/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XNTNzbUJBUXBsTkg3TENEaDJiRjl0SjJsOUU50100xm9H9UTm"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.create.1.json
index 4552e073f7..958284e824 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02w1jJJXcRGWnW1PandbCxkiB1sJ2XdAEXGraupvkylmgAu7",
+  "id": "cs_test_NORMALIZED02nNmM3392mg3LYz7NXpQp1B2Njmnyxzuoo210HFpzWoyCS6",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "1",
+    "remote_server_user_id": "12",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OjJu2DEQaroqDjscA5roWNx",
+  "setup_intent": "seti_1OqSsnDEQaroqDjslbbzv81Z",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02w1jJJXcRGWnW1PandbCxkiB1sJ2XdAEXGraupvkylmgAu7#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02nNmM3392mg3LYz7NXpQp1B2Njmnyxzuoo210HFpzWoyCS6#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.list.1.json
index b3cc40b46b..f8f8430542 100644
--- a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02w1jJJXcRGWnW1PandbCxkiB1sJ2XdAEXGraupvkylmgAu7",
+      "id": "cs_test_NORMALIZED02nNmM3392mg3LYz7NXpQp1B2Njmnyxzuoo210HFpzWoyCS6",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "1",
+        "remote_server_user_id": "12",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OjJu2DEQaroqDjscA5roWNx",
+      "setup_intent": "seti_1OqSsnDEQaroqDjslbbzv81Z",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02w1jJJXcRGWnW1PandbCxkiB1sJ2XdAEXGraupvkylmgAu7#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02nNmM3392mg3LYz7NXpQp1B2Njmnyxzuoo210HFpzWoyCS6#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.modify.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.modify.1.json
index d8dfbf0ab4..8ac63c90eb 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+    "default_payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.1.json
index 402d340a9b..29f7280df3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+      "id": "pm_1OqSm3DEQaroqDjsvgClkLPg",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.2.json
index 402d340a9b..29f7280df3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+      "id": "pm_1OqSm3DEQaroqDjsvgClkLPg",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.3.json
index 402d340a9b..29f7280df3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+      "id": "pm_1OqSm3DEQaroqDjsvgClkLPg",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.4.json
index 402d340a9b..29f7280df3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+      "id": "pm_1OqSm3DEQaroqDjsvgClkLPg",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.5.json
index 95620c751e..57184a82bd 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+      "id": "pm_1OqSm3DEQaroqDjsvgClkLPg",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.6.json
index b8c77c1d7b..46003fa807 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+      "id": "pm_1OqSm3DEQaroqDjsvgClkLPg",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.1.json
index 4574c3856d..064704d9d3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+            "default_payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhulaDEQaroqDjsyz2H7dX6",
+      "id": "evt_1OqSm5DEQaroqDjsusT1i7rH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "619ff200-eca3-4f17-9747-a42e5aa84244"
+        "idempotency_key": "fc72935c-b99e-4f86-abd5-980e6411958a"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.2.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.2.json
index 01da63ba0b..4c44da813e 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+                "payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJjkmK4GMgbMd79awWw6LBYf534h9eIEFpQR-gM8qZ2KwtWnhN-f2GWHvwYFhZnQBlnkctr3si8T9zAO?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKP6Qla8GMgbtqYpLF4g6LBYQIQqRcJGHYY6FXEdO5-Gh_soDNjuogxu8oLzQIDglmI7s7VzLw0J6rX7G?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_xswPs0XOI4NVML6Rs0ZodvCT7",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_wWQepDUVfP7joiaOtkPnyP71p",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+          "payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuldDEQaroqDjs0OAHOlhP",
+      "id": "evt_3OqSm8DEQaroqDjs0SJvEDxn",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "276fa8a6-eb91-4581-abfe-13ee00789c30"
+        "idempotency_key": "e289b9ec-75fe-4fa2-9cab-4d5978bca61b"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKP6Qla8GMgaJvF4579Y6LBa8r14BQFnTF7q-H7MFSQ7-E_mXQaR9Md_rBUCRJkNz0wXNSoXlSEqXK64c?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSm8DEQaroqDjs0EEv15NS",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "e289b9ec-75fe-4fa2-9cab-4d5978bca61b"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY20200cwcAkt4b?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxNw0200Ci9yb3ZU?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY20200cwcAkt4b/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxNw0200Ci9yb3ZU/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -364,13 +493,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuleDEQaroqDjsiDVJkcIq",
+      "id": "evt_1OqSm9DEQaroqDjsexCxviWv",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a7b0095a-1348-4f91-b10d-68e197e99a39"
+        "idempotency_key": "e88ff250-6a3d-46b5-a62d-bc8396f09aae"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY20200cwcAkt4b?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxNw0200Ci9yb3ZU?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY20200cwcAkt4b/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxNw0200Ci9yb3ZU/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhuleDEQaroqDjsuzaKicpc",
+      "id": "evt_1OqSm9DEQaroqDjs0UtVtUTe",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a7b0095a-1348-4f91-b10d-68e197e99a39"
+        "idempotency_key": "e88ff250-6a3d-46b5-a62d-bc8396f09aae"
       },
       "type": "invoice.updated"
     },
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_xswPs0XOI4NVML6Rs0ZodvCT7",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_wWQepDUVfP7joiaOtkPnyP71p",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuldDEQaroqDjs0vPGVTV9",
+      "id": "evt_3OqSm8DEQaroqDjs08RMpl63",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "a7b0095a-1348-4f91-b10d-68e197e99a39"
+        "idempotency_key": "e88ff250-6a3d-46b5-a62d-bc8396f09aae"
       },
       "type": "payment_intent.created"
     },
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -821,16 +952,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuldDEQaroqDjsvY2Q2zgl",
+      "id": "evt_1OqSm8DEQaroqDjsxge0uCBW",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "db551268-f09d-42b3-924d-4030c9848c91"
+        "idempotency_key": "c764f8d2-2487-4e50-8413-74051445e956"
       },
       "type": "invoice.created"
     },
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhulcDEQaroqDjsOJ4Lsyd5",
+      "id": "evt_1OqSm7DEQaroqDjspTFr7PXY",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "bbe18a67-5aeb-4141-98fc-dd3f7a5f5e7e"
+        "idempotency_key": "a76e8785-28cd-4fd8-a278-71e1547793c1"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+            "default_payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhulcDEQaroqDjsmIHBAW40",
+      "id": "evt_1OqSm7DEQaroqDjsTuYesyuB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "bbe18a67-5aeb-4141-98fc-dd3f7a5f5e7e"
+        "idempotency_key": "a76e8785-28cd-4fd8-a278-71e1547793c1"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.3.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.3.json
index b5fdc14874..7ee4b01429 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY40200q93hz7zT?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY40200q93hz7zT/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,197 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhulgDEQaroqDjsXnnmSDN5",
+      "id": "evt_1OqSmADEQaroqDjsQq7buQ12",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "276fa8a6-eb91-4581-abfe-13ee00789c30"
+        "idempotency_key": "e289b9ec-75fe-4fa2-9cab-4d5978bca61b"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSmADEQaroqDjsxAJ7MJkG",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "e289b9ec-75fe-4fa2-9cab-4d5978bca61b"
       },
       "type": "invoice.paid"
     },
@@ -230,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY40200q93hz7zT?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY40200q93hz7zT/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -368,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhulgDEQaroqDjsjDsUVfPm",
+      "id": "evt_1OqSmADEQaroqDjswd1AjLgy",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "276fa8a6-eb91-4581-abfe-13ee00789c30"
+        "idempotency_key": "e289b9ec-75fe-4fa2-9cab-4d5978bca61b"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.4.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.4.json
index 9297923303..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.4.json
@@ -1,189 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY40200q93hz7zT?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY40200q93hz7zT/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhulgDEQaroqDjs3YBLguEu",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "276fa8a6-eb91-4581-abfe-13ee00789c30"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.5.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.1.json
index f4f30938d0..347fe6644d 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.2.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.2.json
index 0bcf70b87c..3b53c1ee72 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 148610,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.3.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.3.json
index 7c7187bf49..f95cdd2c13 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.3.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 20000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json
index 9522e24807..f50d61d7a3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY20200cwcAkt4b?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxNg0200e4yqATqX?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY20200cwcAkt4b/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxNg0200e4yqATqX/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json
index cc5794abb9..9a2e846262 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQW44ZkJ5UE0yVm90dTVDUnk1VVd2MGRGbE9pLDk4MDI4NTcx0200gWyMWekf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QcmpmY3R1NG5wMDFOQkd5anhZWDFKdEdWQWVJLDEwMDA2NTkyMg0200jkm5nOjb?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQW44ZkJ5UE0yVm90dTVDUnk1VVd2MGRGbE9pLDk4MDI4NTcx0200gWyMWekf/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QcmpmY3R1NG5wMDFOQkd5anhZWDFKdEdWQWVJLDEwMDA2NTkyMg0200jkm5nOjb/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 148610,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json
index 1c2ec5fdc0..7a48b3a4b3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqMDhFNnVSa1RVcFo1ckdNZUNoeWlSdU9aZFJwLDk4MDI4NTc00200UOkgtaqG?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdmJFUk5sQ3N2NW94Y2x2RTc0cUhQY2V2QTdwLDEwMDA2NTkyNA0200L6jsoa4L?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqMDhFNnVSa1RVcFo1ckdNZUNoeWlSdU9aZFJwLDk4MDI4NTc00200UOkgtaqG/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdmJFUk5sQ3N2NW94Y2x2RTc0cUhQY2V2QTdwLDEwMDA2NTkyNA0200L6jsoa4L/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 20000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.2.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.2.json
index f46f869c11..d0d1add02e 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQW44ZkJ5UE0yVm90dTVDUnk1VVd2MGRGbE9pLDk4MDI4NTcy0200VjGVrRUv?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QcmpmY3R1NG5wMDFOQkd5anhZWDFKdEdWQWVJLDEwMDA2NTkyMg0200jkm5nOjb?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQW44ZkJ5UE0yVm90dTVDUnk1VVd2MGRGbE9pLDk4MDI4NTcy0200VjGVrRUv/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QcmpmY3R1NG5wMDFOQkd5anhZWDFKdEdWQWVJLDEwMDA2NTkyMg0200jkm5nOjb/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -210,7 +212,7 @@
       "total_excluding_tax": 148610,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -255,9 +257,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTcy0200RSipq00T?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkyMg0200NtuaQgR5?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTcy0200RSipq00T/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkyMg0200NtuaQgR5/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -274,6 +276,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.3.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.3.json
index a412b31025..6fa88404b5 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.3.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqMDhFNnVSa1RVcFo1ckdNZUNoeWlSdU9aZFJwLDk4MDI4NTc00200UOkgtaqG?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdmJFUk5sQ3N2NW94Y2x2RTc0cUhQY2V2QTdwLDEwMDA2NTkyNA0200L6jsoa4L?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqMDhFNnVSa1RVcFo1ckdNZUNoeWlSdU9aZFJwLDk4MDI4NTc00200UOkgtaqG/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdmJFUk5sQ3N2NW94Y2x2RTc0cUhQY2V2QTdwLDEwMDA2NTkyNA0200L6jsoa4L/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -160,7 +161,7 @@
       "total_excluding_tax": 20000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQW44ZkJ5UE0yVm90dTVDUnk1VVd2MGRGbE9pLDk4MDI4NTc00200AeHhchkC?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QcmpmY3R1NG5wMDFOQkd5anhZWDFKdEdWQWVJLDEwMDA2NTkyNA02005SddC7uV?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQW44ZkJ5UE0yVm90dTVDUnk1VVd2MGRGbE9pLDk4MDI4NTc00200AeHhchkC/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QcmpmY3R1NG5wMDFOQkd5anhZWDFKdEdWQWVJLDEwMDA2NTkyNA02005SddC7uV/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -274,6 +276,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -417,9 +420,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTc00200Vy8byRzg?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkyNA0200BFPTBfZm?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTc00200Vy8byRzg/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkyNA0200BFPTBfZm/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -436,6 +439,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.pay.1.json
index 288bcdba2f..d8539600de 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY30200fVTK8Ixf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVUo3M1NzbzEyN0d6bVJGWFZjMjNpN1FoVHdPLDk4MDI4NTY30200fVTK8Ixf/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9PMkY2Q2FUU3FqYUpzeUVkamxlNTdqVzR2WUFmLDEwMDA2NTkxOA0200dmd2cqXR/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.create.1.json
index 02aa794dc9..dc66318af8 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhulYDEQaroqDjsM8hLj36A_secret_PWyjAzbegiEEcYcEVKB6nFLRqUVLJaC",
+  "client_secret": "seti_1OqSm3DEQaroqDjseNXeqbTU_secret_PfoO8JOXZFMNvZIjhDiGcJTcb9GlbnC",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhulYDEQaroqDjsM8hLj36A",
+  "id": "seti_1OqSm3DEQaroqDjseNXeqbTU",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhulYDEQaroqDjszA642hrx",
+  "latest_attempt": "setatt_1OqSm3DEQaroqDjsP6GV8sIy",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+  "payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.list.1.json
index 5ea6ddbe53..3edc1b2d9a 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhulXDEQaroqDjsXoaKARhm_secret_PWyiH0Gp8MjRSrtlBB9fnMsPVitftwz",
+      "client_secret": "seti_1OqSm2DEQaroqDjs9CqRZPgb_secret_PfoO1pTuQ5fLIKhMlv6fPSD1rwrPIHj",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhulXDEQaroqDjsXoaKARhm",
+      "id": "seti_1OqSm2DEQaroqDjs9CqRZPgb",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.retrieve.1.json
index 02aa794dc9..dc66318af8 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhulYDEQaroqDjsM8hLj36A_secret_PWyjAzbegiEEcYcEVKB6nFLRqUVLJaC",
+  "client_secret": "seti_1OqSm3DEQaroqDjseNXeqbTU_secret_PfoO8JOXZFMNvZIjhDiGcJTcb9GlbnC",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhulYDEQaroqDjsM8hLj36A",
+  "id": "seti_1OqSm3DEQaroqDjseNXeqbTU",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhulYDEQaroqDjszA642hrx",
+  "latest_attempt": "setatt_1OqSm3DEQaroqDjsP6GV8sIy",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhulYDEQaroqDjsqbK1LFYs",
+  "payment_method": "pm_1OqSm3DEQaroqDjsvgClkLPg",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.create.1.json
index 032252c63f..d3d5aa9fae 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED025e7HjCZpen4vvObfySjcyJYDWSuoRH2TqXoSDAZuOarTmX",
+  "id": "cs_test_NORMALIZED02MrOCrZhBaK4xJ6TwWZO4J3B6Pajui5xMZQWQBKrsItBJ5S",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhulXDEQaroqDjsXoaKARhm",
+  "setup_intent": "seti_1OqSm2DEQaroqDjs9CqRZPgb",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED025e7HjCZpen4vvObfySjcyJYDWSuoRH2TqXoSDAZuOarTmX#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02MrOCrZhBaK4xJ6TwWZO4J3B6Pajui5xMZQWQBKrsItBJ5S#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.list.1.json
index 389284aee6..bfe8be7d1a 100644
--- a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED025e7HjCZpen4vvObfySjcyJYDWSuoRH2TqXoSDAZuOarTmX",
+      "id": "cs_test_NORMALIZED02MrOCrZhBaK4xJ6TwWZO4J3B6Pajui5xMZQWQBKrsItBJ5S",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhulXDEQaroqDjsXoaKARhm",
+      "setup_intent": "seti_1OqSm2DEQaroqDjs9CqRZPgb",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED025e7HjCZpen4vvObfySjcyJYDWSuoRH2TqXoSDAZuOarTmX#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02MrOCrZhBaK4xJ6TwWZO4J3B6Pajui5xMZQWQBKrsItBJ5S#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.modify.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.modify.1.json
index 642e3f111d..f6436d0bf5 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+    "default_payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.1.json
index 4d4862e550..74d4a11536 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+      "id": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.2.json
index 4d4862e550..74d4a11536 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+      "id": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.3.json
index 4d4862e550..74d4a11536 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+      "id": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.4.json
index 4d4862e550..74d4a11536 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+      "id": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.5.json
index 763fd9f09e..c795623b1d 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+      "id": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.1.json
index 0c27339767..67c9addb7a 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+            "default_payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhulqDEQaroqDjsbd3YkFYz",
+      "id": "evt_1OqSmKDEQaroqDjsckNg7RdF",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "80a70781-bc6b-4d46-b89d-1eba431c208f"
+        "idempotency_key": "8cb793fb-7e4d-4620-861e-55e97bc959a5"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.2.json
index a9daff7a54..7f0d8a89d6 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+                "payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 4800,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKjkmK4GMgawgyXFbO86LBZbmjbkoTIuz4tbFbYBxuTupj8asxoP7PA89g6A6rXQYmyE8bSKmytOVG1f?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKI2Rla8GMgYHmLaas5g6LBbq9nwMPJzq-MgFG2g9VpekSlPpxhWheVcjzOLD1GVD6DAY2SnwsHq6cKb3?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_C9aYn8tKwR6cQ4f2leGU1PXJO",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_testUpjsa3evqEGan20nk06ZL",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+          "payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuluDEQaroqDjs1InM8iYB",
+      "id": "evt_3OqSmNDEQaroqDjs0oycs56y",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "857c5fc4-12f6-4a84-91cb-c255cf4ddc9b"
+        "idempotency_key": "a8241f4e-287d-4ec8-bf76-309d0f484965"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+          "payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
           "payment_method_details": {
             "card": {
               "amount_authorized": 4800,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKjkmK4GMgbUTdCKSJE6LBalEQLnyQxYgcmelCSLs52P1nr_BUMj1SmNrQ5Me-UNQ-y40gvpu8THaHfL?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKI2Rla8GMgaFs84j8Xg6LBa9ENFKQlePLo3Wz7j_sNjRf_ddp--0FZxv5ve4-ZMVi6GeVhI83tgKseTO?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuluDEQaroqDjs1dKjTsGq",
+      "id": "evt_3OqSmNDEQaroqDjs04SqtQ0B",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "857c5fc4-12f6-4a84-91cb-c255cf4ddc9b"
+        "idempotency_key": "a8241f4e-287d-4ec8-bf76-309d0f484965"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTgy0200MtBtAXfZ?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMg0200DqbBtHuM?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTgy0200MtBtAXfZ/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMg0200DqbBtHuM/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -489,16 +490,16 @@
           "total_excluding_tax": 4800,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuluDEQaroqDjsRveYfbG4",
+      "id": "evt_1OqSmODEQaroqDjsaGOnY7Qq",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "2579fa28-813b-452f-8cdd-e12fee6db500"
+        "idempotency_key": "f011c168-4d89-4e2f-88d0-fbb62080f642"
       },
       "type": "invoice.finalized"
     },
@@ -549,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTgy0200MtBtAXfZ?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMg0200DqbBtHuM?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTgy0200MtBtAXfZ/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMg0200DqbBtHuM/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -568,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -672,7 +674,7 @@
           "total_excluding_tax": 4800,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -692,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhuluDEQaroqDjsdTVT0Pv2",
+      "id": "evt_1OqSmODEQaroqDjsGbieO3ZN",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "2579fa28-813b-452f-8cdd-e12fee6db500"
+        "idempotency_key": "f011c168-4d89-4e2f-88d0-fbb62080f642"
       },
       "type": "invoice.updated"
     },
@@ -726,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_C9aYn8tKwR6cQ4f2leGU1PXJO",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_testUpjsa3evqEGan20nk06ZL",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -769,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuluDEQaroqDjs1ka0WHVt",
+      "id": "evt_3OqSmNDEQaroqDjs03tblvVH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "2579fa28-813b-452f-8cdd-e12fee6db500"
+        "idempotency_key": "f011c168-4d89-4e2f-88d0-fbb62080f642"
       },
       "type": "payment_intent.created"
     },
@@ -845,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -949,16 +952,16 @@
           "total_excluding_tax": 4800,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhultDEQaroqDjsJ8g2ZYnd",
+      "id": "evt_1OqSmNDEQaroqDjs39GnRpnT",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "10869031-cb03-4643-8135-d5aab7a5ff0c"
+        "idempotency_key": "5a133dd5-377d-4238-841f-cbc3edda01b9"
       },
       "type": "invoice.created"
     },
@@ -1014,13 +1017,13 @@
           "unit_amount_decimal": "800"
         }
       },
-      "id": "evt_1OhultDEQaroqDjsNctss8yR",
+      "id": "evt_1OqSmNDEQaroqDjsrzDdPDZM",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "738b8d98-366c-4e62-89c6-a882c19fc928"
+        "idempotency_key": "561ca0e0-673c-45aa-86f2-ab4b47527574"
       },
       "type": "invoiceitem.created"
     },
@@ -1043,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+            "default_payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
             "footer": null,
             "rendering_options": null
           },
@@ -1066,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhultDEQaroqDjsPylAumas",
+      "id": "evt_1OqSmNDEQaroqDjsFIBznjhE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "738b8d98-366c-4e62-89c6-a882c19fc928"
+        "idempotency_key": "561ca0e0-673c-45aa-86f2-ab4b47527574"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.3.json
index ec3880cc9c..475f522005 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzNA0200eB49IKGN?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzNA0200eB49IKGN/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhulwDEQaroqDjsKYDTa3gM",
+      "id": "evt_1OqSmQDEQaroqDjsDoAjbskW",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "857c5fc4-12f6-4a84-91cb-c255cf4ddc9b"
+        "idempotency_key": "a8241f4e-287d-4ec8-bf76-309d0f484965"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzNA0200eB49IKGN?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzNA0200eB49IKGN/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +250,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -356,13 +358,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhulwDEQaroqDjsfl4TXYom",
+      "id": "evt_1OqSmQDEQaroqDjsrgj26afY",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "857c5fc4-12f6-4a84-91cb-c255cf4ddc9b"
+        "idempotency_key": "a8241f4e-287d-4ec8-bf76-309d0f484965"
       },
       "type": "invoice.paid"
     },
@@ -413,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMw02002fuX1SYT?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMw02002fuX1SYT/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -432,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -551,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhulwDEQaroqDjspFKAUhfC",
+      "id": "evt_1OqSmQDEQaroqDjsNeDfBucj",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "857c5fc4-12f6-4a84-91cb-c255cf4ddc9b"
+        "idempotency_key": "a8241f4e-287d-4ec8-bf76-309d0f484965"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.1.json
index 7d3a76cd31..ba53b93cc5 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 4800,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.2.json
index a64f3a4948..c1136b877b 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 11200,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.3.json
index 1c53c281d2..65881613f4 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.3.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 200000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.4.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.4.json
index e7ca750b86..8bb561cb7e 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.4.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000004",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 36830,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.5.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.5.json
index 448fdf70cc..619fd044e1 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.5.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.5.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000006",
+        "invoice": "in_NORMALIZED00000000000005",
         "invoice_item": "ii_NORMALIZED00000000000006",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 240000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json
index 382bad3295..c0d273498b 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTgy0200MtBtAXfZ?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMg0200DqbBtHuM?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTgy0200MtBtAXfZ/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMg0200DqbBtHuM/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 4800,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json
index 8bdccaa6bf..ee1938f508 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTg30200vOWsB6vE?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTkzNw0200Vw1kdMV1?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTg30200vOWsB6vE/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTkzNw0200Vw1kdMV1/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 11200,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json
index a8db2bbcfe..aeccfb26cf 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTg50200isXQNkLR?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTkzOQ0200VRs7nZK1?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTg50200isXQNkLR/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTkzOQ0200VRs7nZK1/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 200000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.4.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.4.json
index f3069c0f76..1c7a9c2197 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.4.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqbnlUeFRWcXFaaWJ4MFNxMUxwdEJQVTMzUTdrLDk4MDI4NTkx0200zJ0uvjjM?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QZkJBN1hwRHJrUmhiMkFzT2s4UXdTWlViSzI0LDEwMDA2NTk0MQ0200YUz7pWhc?s=ap",
   "id": "in_NORMALIZED00000000000004",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqbnlUeFRWcXFaaWJ4MFNxMUxwdEJQVTMzUTdrLDk4MDI4NTkx0200zJ0uvjjM/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QZkJBN1hwRHJrUmhiMkFzT2s4UXdTWlViSzI0LDEwMDA2NTk0MQ0200YUz7pWhc/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000005",
+        "invoice": "in_NORMALIZED00000000000004",
         "invoice_item": "ii_NORMALIZED00000000000005",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 36830,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.5.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.5.json
index ceb124971b..d96e59d4aa 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.5.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.5.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqRFZnN0h5QjFWWFlhd2FxOWVaSnZjOFJpRHV5LDk4MDI4NTk00200BADQHQCf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QalA1a3ZUNklvTnltMzQ3QVkxSldyQmVncmx2LDEwMDA2NTk0Mw0200gPPCTQ2u?s=ap",
   "id": "in_NORMALIZED00000000000005",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqRFZnN0h5QjFWWFlhd2FxOWVaSnZjOFJpRHV5LDk4MDI4NTk00200BADQHQCf/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QalA1a3ZUNklvTnltMzQ3QVkxSldyQmVncmx2LDEwMDA2NTk0Mw0200gPPCTQ2u/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000006",
+        "invoice": "in_NORMALIZED00000000000005",
         "invoice_item": "ii_NORMALIZED00000000000006",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.2.json
index 52caa34ec3..470aab8867 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTg50200isXQNkLR?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTkzOQ0200VRs7nZK1?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTg50200isXQNkLR/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTkzOQ0200VRs7nZK1/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -210,7 +212,7 @@
       "total_excluding_tax": 200000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -255,9 +257,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTg50200NjTtAlu1?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTkzOQ020096TQ8Krc?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTg50200NjTtAlu1/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTkzOQ020096TQ8Krc/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -274,6 +276,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -417,9 +420,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg50200XaRB4eFe?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzOQ0200KAEckya5?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg50200XaRB4eFe/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzOQ0200KAEckya5/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -436,6 +439,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.3.json
index f9c88495b9..d82637c401 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.3.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqbnlUeFRWcXFaaWJ4MFNxMUxwdEJQVTMzUTdrLDk4MDI4NTky0200ZWuDWZYX?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QZkJBN1hwRHJrUmhiMkFzT2s4UXdTWlViSzI0LDEwMDA2NTk0MQ0200YUz7pWhc?s=ap",
       "id": "in_NORMALIZED00000000000004",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqbnlUeFRWcXFaaWJ4MFNxMUxwdEJQVTMzUTdrLDk4MDI4NTky0200ZWuDWZYX/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QZkJBN1hwRHJrUmhiMkFzT2s4UXdTWlViSzI0LDEwMDA2NTk0MQ0200YUz7pWhc/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000005",
+            "invoice": "in_NORMALIZED00000000000004",
             "invoice_item": "ii_NORMALIZED00000000000005",
             "livemode": false,
             "metadata": {},
@@ -160,7 +161,7 @@
       "total_excluding_tax": 36830,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTky0200m6OR5y8t?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTk0MQ0200gwCJuOsy?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTky0200m6OR5y8t/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTk0MQ0200gwCJuOsy/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -274,6 +276,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -417,9 +420,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTky0200ZS6q9vl4?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTk0MQ02003fToVVQp?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTky0200ZS6q9vl4/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTk0MQ02003fToVVQp/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -436,6 +439,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -579,9 +583,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTky0200sc3B7x63?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTk0MQ0200C44LaeMA?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTky0200sc3B7x63/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTk0MQ0200C44LaeMA/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -598,6 +602,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.4.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.4.json
index b9db3ebb12..f5095ce2d9 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.4.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqRFZnN0h5QjFWWFlhd2FxOWVaSnZjOFJpRHV5LDk4MDI4NTk00200BADQHQCf?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QalA1a3ZUNklvTnltMzQ3QVkxSldyQmVncmx2LDEwMDA2NTk0Mw0200gPPCTQ2u?s=ap",
       "id": "in_NORMALIZED00000000000005",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqRFZnN0h5QjFWWFlhd2FxOWVaSnZjOFJpRHV5LDk4MDI4NTk00200BADQHQCf/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QalA1a3ZUNklvTnltMzQ3QVkxSldyQmVncmx2LDEwMDA2NTk0Mw0200gPPCTQ2u/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000006",
+            "invoice": "in_NORMALIZED00000000000005",
             "invoice_item": "ii_NORMALIZED00000000000006",
             "livemode": false,
             "metadata": {},
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqbnlUeFRWcXFaaWJ4MFNxMUxwdEJQVTMzUTdrLDk4MDI4NTk00200Lo7jLOWz?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QZkJBN1hwRHJrUmhiMkFzT2s4UXdTWlViSzI0LDEwMDA2NTk0Mw0200ZLNRrRKN?s=ap",
       "id": "in_NORMALIZED00000000000004",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqbnlUeFRWcXFaaWJ4MFNxMUxwdEJQVTMzUTdrLDk4MDI4NTk00200Lo7jLOWz/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QZkJBN1hwRHJrUmhiMkFzT2s4UXdTWlViSzI0LDEwMDA2NTk0Mw0200ZLNRrRKN/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000005",
+            "invoice": "in_NORMALIZED00000000000004",
             "invoice_item": "ii_NORMALIZED00000000000005",
             "livemode": false,
             "metadata": {},
@@ -367,9 +369,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTk00200VxkMDwCT?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTk0Mw0200wW9Fzbb4?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqWHlPTzZybTdxZGtCUUY1R0s0aWxoR2dBSmVnLDk4MDI4NTk00200VxkMDwCT/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qc2E4OENoRm9KS0tKSHM4M2pYWVB0WVdzdWw5LDEwMDA2NTk0Mw0200wW9Fzbb4/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -386,6 +388,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -436,6 +439,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -579,9 +583,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTk00200PCp3cfyb?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTk0Mw02004Q1gJYPc?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqQTNKVkJaRGdZWFJadmFwVDJuQkR0TGdKTXM2LDk4MDI4NTk00200PCp3cfyb/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QQXpKeDZYYTJEd1NacXc1ejFQbFBsOFo4UGRsLDEwMDA2NTk0Mw02004Q1gJYPc/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -598,6 +602,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -741,9 +746,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTk00200HlqCOSZ8?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTk0Mw0200rSExxcup?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTk00200HlqCOSZ8/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTk0Mw0200rSExxcup/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -760,6 +765,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.pay.1.json
index feb18ff03a..8d5319d23c 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMw02002fuX1SYT?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVDI1Rm5JQXZxNEtXQ21STnhPNmhrUWhqQktpLDk4MDI4NTg002009SwByyhu/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QYUNGblczRkMzMUw2OExMT1BSYWRSaWZoRHBGLDEwMDA2NTkzMw02002fuX1SYT/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.create.1.json
index 423c159862..1e186d79ca 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuloDEQaroqDjsU3ePQHFD_secret_PWyjKJbbzCVsfQ5e96qu95t4ODHJYiL",
+  "client_secret": "seti_1OqSmIDEQaroqDjsUp0wdMPH_secret_PfoP7TAP0bJjRtILti3KsjwG577Uh7m",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuloDEQaroqDjsU3ePQHFD",
+  "id": "seti_1OqSmIDEQaroqDjsUp0wdMPH",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuloDEQaroqDjsMfoJuCIM",
+  "latest_attempt": "setatt_1OqSmIDEQaroqDjsBpVQ4HGx",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+  "payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.list.1.json
index 9dc21ff3b2..301dad6759 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuloDEQaroqDjsIxjm9UUV_secret_PWyjEZ7tDEIcX4MV7XfHlDqKswX0Dc6",
+      "client_secret": "seti_1OqSmIDEQaroqDjsZk3ZwmTc_secret_PfoPUXFufF78fwJbQm8W36s7DWCcLEi",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuloDEQaroqDjsIxjm9UUV",
+      "id": "seti_1OqSmIDEQaroqDjsZk3ZwmTc",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.retrieve.1.json
index 423c159862..1e186d79ca 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhuloDEQaroqDjsU3ePQHFD_secret_PWyjKJbbzCVsfQ5e96qu95t4ODHJYiL",
+  "client_secret": "seti_1OqSmIDEQaroqDjsUp0wdMPH_secret_PfoP7TAP0bJjRtILti3KsjwG577Uh7m",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhuloDEQaroqDjsU3ePQHFD",
+  "id": "seti_1OqSmIDEQaroqDjsUp0wdMPH",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhuloDEQaroqDjsMfoJuCIM",
+  "latest_attempt": "setatt_1OqSmIDEQaroqDjsBpVQ4HGx",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhuloDEQaroqDjsHsgtQgq7",
+  "payment_method": "pm_1OqSmIDEQaroqDjsWyWrNgtH",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.create.1.json
index 5ac2c1a643..6d41e8c939 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02aYMGw80EtcIxGg74SnY3UqmKI6j56u5aKVFwj9iP8DVD4R",
+  "id": "cs_test_NORMALIZED02MP1Qo59f1vSqFdUcxGvcDxhoRPBHfZRcafeBbf46sRyWR1",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuloDEQaroqDjsIxjm9UUV",
+  "setup_intent": "seti_1OqSmIDEQaroqDjsZk3ZwmTc",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02aYMGw80EtcIxGg74SnY3UqmKI6j56u5aKVFwj9iP8DVD4R#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02MP1Qo59f1vSqFdUcxGvcDxhoRPBHfZRcafeBbf46sRyWR1#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.list.1.json
index 59189598f0..3888ec0609 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02aYMGw80EtcIxGg74SnY3UqmKI6j56u5aKVFwj9iP8DVD4R",
+      "id": "cs_test_NORMALIZED02MP1Qo59f1vSqFdUcxGvcDxhoRPBHfZRcafeBbf46sRyWR1",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuloDEQaroqDjsIxjm9UUV",
+      "setup_intent": "seti_1OqSmIDEQaroqDjsZk3ZwmTc",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02aYMGw80EtcIxGg74SnY3UqmKI6j56u5aKVFwj9iP8DVD4R#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02MP1Qo59f1vSqFdUcxGvcDxhoRPBHfZRcafeBbf46sRyWR1#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.modify.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.modify.1.json
index 31925185bc..c7d710079b 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+    "default_payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.1.json
index 7c829173ed..f88ca37891 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+      "id": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.2.json
index 7c829173ed..f88ca37891 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+      "id": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.3.json
index 7c829173ed..f88ca37891 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+      "id": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.4.json
index 7c829173ed..f88ca37891 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+      "id": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.5.json
index e6e9a2cf31..84e369d4ca 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+      "id": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.1.json
index 24ee07bc39..59468225a8 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+            "default_payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhumADEQaroqDjsw0zVrrG0",
+      "id": "evt_1OqSmdDEQaroqDjsovtsPXlA",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "efecb42f-0a2e-4c0d-a0f9-e851c7483dac"
+        "idempotency_key": "57f58787-9e39-4f1c-8723-2c39cd6c8991"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.2.json
index bbf2a696ea..40312de885 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+                "payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 28000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLzkmK4GMgYJ3mXCijQ6LBZF8YBH_o8-JSTKSLJQ-8LqTMBvdaJglIovRe_6hPFoFY-X6LkGD3mnlzJO?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKCRla8GMga3Qyy1Wek6LBY6Cqmv2nFp5-XKL30uxWOlApcq04_ia3SC-jo9R1hVTfhg4WL0nHTIIs6m?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_b9eW3w1rjWww78zx23ZMRokCV",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_5QLe1ZmpnyRE7qm7yLuGwnrKk",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+          "payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhumDDEQaroqDjs13n1Ey7B",
+      "id": "evt_3OqSmgDEQaroqDjs1PxFgS8n",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f9cf1d80-1f63-4239-9fae-63cc2d07c279"
+        "idempotency_key": "4d229cf1-2014-4850-ba5a-990ab7f7eb1d"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 28000,
+          "amount_captured": 28000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 28000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 28000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKCRla8GMgaE-u7XF1g6LBaUJJ74H5ZDjLzNHHITnFLq5Aj4DuGtSwtE_gxjuB17-t-a5XFqgJBT6_sk?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSmgDEQaroqDjs1mTOPU53",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "4d229cf1-2014-4850-ba5a-990ab7f7eb1d"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAy0200EjmwbjiE?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1MQ0200RcAa4PfI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAy0200EjmwbjiE/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1MQ0200RcAa4PfI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -364,13 +493,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhumEDEQaroqDjs7RI0GlNO",
+      "id": "evt_1OqSmhDEQaroqDjsjLqxVk8D",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "545f04b9-72af-4bd3-a94a-2e0ce5880193"
+        "idempotency_key": "436727b4-5e3b-46b7-86de-ab6e1e186500"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAy0200EjmwbjiE?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1MQ0200RcAa4PfI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAy0200EjmwbjiE/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1MQ0200RcAa4PfI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1OhumEDEQaroqDjsQgcA8cSI",
+      "id": "evt_1OqSmhDEQaroqDjsO3zxYQPC",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "545f04b9-72af-4bd3-a94a-2e0ce5880193"
+        "idempotency_key": "436727b4-5e3b-46b7-86de-ab6e1e186500"
       },
       "type": "invoice.updated"
     },
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_b9eW3w1rjWww78zx23ZMRokCV",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_5QLe1ZmpnyRE7qm7yLuGwnrKk",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhumDDEQaroqDjs1J7pCUhN",
+      "id": "evt_3OqSmgDEQaroqDjs1RMId9fv",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "545f04b9-72af-4bd3-a94a-2e0ce5880193"
+        "idempotency_key": "436727b4-5e3b-46b7-86de-ab6e1e186500"
       },
       "type": "payment_intent.created"
     },
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -821,16 +952,16 @@
           "total_excluding_tax": 28000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhumDDEQaroqDjssof9vQZL",
+      "id": "evt_1OqSmgDEQaroqDjsEnHgFx10",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "8ab85cd6-031c-49f7-8e19-db07a9945abb"
+        "idempotency_key": "609a219c-544b-4e25-b26d-496b7354bafa"
       },
       "type": "invoice.created"
     },
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "800"
         }
       },
-      "id": "evt_1OhumCDEQaroqDjsRndFPypk",
+      "id": "evt_1OqSmfDEQaroqDjseUSjQmSZ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "dcf1f681-4c40-4a51-b833-43516242866f"
+        "idempotency_key": "7fb32e1c-0949-4c83-bb98-bb24a3afa655"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+            "default_payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhumCDEQaroqDjsnY9e79bJ",
+      "id": "evt_1OqSmfDEQaroqDjsNiCkE7tg",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "dcf1f681-4c40-4a51-b833-43516242866f"
+        "idempotency_key": "7fb32e1c-0949-4c83-bb98-bb24a3afa655"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.3.json
index b961280310..518340a02b 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA00200NXr3iU5W?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mw0200gnsC8iHc?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA00200NXr3iU5W/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mw0200gnsC8iHc/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,197 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhumGDEQaroqDjsY6FIqjQz",
+      "id": "evt_1OqSmjDEQaroqDjsS7lyHF0R",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f9cf1d80-1f63-4239-9fae-63cc2d07c279"
+        "idempotency_key": "4d229cf1-2014-4850-ba5a-990ab7f7eb1d"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 28000,
+          "amount_paid": 28000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mw0200gnsC8iHc?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mw0200gnsC8iHc/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 28000,
+                "amount_excluding_tax": 28000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 800,
+                  "unit_amount_decimal": "800"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 35,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "800"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "manual",
+            "licenses": "35",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 28000,
+          "subtotal_excluding_tax": 28000,
+          "tax": null,
+          "test_clock": null,
+          "total": 28000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 28000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSmjDEQaroqDjslr2bkjEv",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "4d229cf1-2014-4850-ba5a-990ab7f7eb1d"
       },
       "type": "invoice.paid"
     },
@@ -230,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA00200NXr3iU5W?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mg0200wRkvh2SS?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA00200NXr3iU5W/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mg0200wRkvh2SS/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -368,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhumGDEQaroqDjsnYgTdopk",
+      "id": "evt_1OqSmjDEQaroqDjsHolXEooE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "f9cf1d80-1f63-4239-9fae-63cc2d07c279"
+        "idempotency_key": "4d229cf1-2014-4850-ba5a-990ab7f7eb1d"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.4.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.4.json
index 46398c466e..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.4.json
@@ -1,189 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 28000,
-          "amount_paid": 28000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA00200NXr3iU5W?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA00200NXr3iU5W/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 28000,
-                "amount_excluding_tax": 28000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 800,
-                  "unit_amount_decimal": "800"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 35,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "800"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "manual",
-            "licenses": "35",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 28000,
-          "subtotal_excluding_tax": 28000,
-          "tax": null,
-          "test_clock": null,
-          "total": 28000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 28000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhumGDEQaroqDjsHCbSEyaD",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "f9cf1d80-1f63-4239-9fae-63cc2d07c279"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.5.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.1.json
index af54c2f023..20cd1d9190 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 28000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.2.json
index 14733849f1..5f874fbee3 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 280000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.3.json
index f450b9decd..63901faee4 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.3.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 280000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.1.json
index 3828d1dccd..8961fd5ad9 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAy0200EjmwbjiE?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1MQ0200RcAa4PfI?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAy0200EjmwbjiE/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1MQ0200RcAa4PfI/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.2.json
index 1c34a4c35b..04a6c619b2 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqY2Z3blNVZTlCc2tHV2FZa3ljUjByajN2M21OLDk4MDI4NjA30200S2qzdnRK?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QaFlCMEZ5REowUWxnbHM4Q0NnWm1XTUZ0U1N0LDEwMDA2NTk1Ng02007zotbEr1?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqY2Z3blNVZTlCc2tHV2FZa3ljUjByajN2M21OLDk4MDI4NjA30200S2qzdnRK/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QaFlCMEZ5REowUWxnbHM4Q0NnWm1XTUZ0U1N0LDEwMDA2NTk1Ng02007zotbEr1/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 280000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.3.json
index 1cd119e9b9..5ccbae67c0 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqV2V4VWNTcGZ1cXZDaTdWMldhOWNOYVVBb1RQLDk4MDI4NjEw0200a4kyxFY9?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QS292MWkxOUl4YXAyUzZDR2hjakN4UXVxQVBULDEwMDA2NTk1OA02000LeHPTzJ?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqV2V4VWNTcGZ1cXZDaTdWMldhOWNOYVVBb1RQLDk4MDI4NjEw0200a4kyxFY9/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QS292MWkxOUl4YXAyUzZDR2hjakN4UXVxQVBULDEwMDA2NTk1OA02000LeHPTzJ/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 280000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.2.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.2.json
index 51facda505..e20945a033 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqY2Z3blNVZTlCc2tHV2FZa3ljUjByajN2M21OLDk4MDI4NjA40200M80oHnky?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QaFlCMEZ5REowUWxnbHM4Q0NnWm1XTUZ0U1N0LDEwMDA2NTk1Ng02007zotbEr1?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqY2Z3blNVZTlCc2tHV2FZa3ljUjByajN2M21OLDk4MDI4NjA40200M80oHnky/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QaFlCMEZ5REowUWxnbHM4Q0NnWm1XTUZ0U1N0LDEwMDA2NTk1Ng02007zotbEr1/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -160,7 +161,7 @@
       "total_excluding_tax": 280000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA40200Od4TKdHz?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Ng02001I5gyY7e?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjA40200Od4TKdHz/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Ng02001I5gyY7e/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.3.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.3.json
index 598216afd3..a2113659f5 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.3.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.3.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqV2V4VWNTcGZ1cXZDaTdWMldhOWNOYVVBb1RQLDk4MDI4NjEw0200a4kyxFY9?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QS292MWkxOUl4YXAyUzZDR2hjakN4UXVxQVBULDEwMDA2NTk1OA02000LeHPTzJ?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqV2V4VWNTcGZ1cXZDaTdWMldhOWNOYVVBb1RQLDk4MDI4NjEw0200a4kyxFY9/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QS292MWkxOUl4YXAyUzZDR2hjakN4UXVxQVBULDEwMDA2NTk1OA02000LeHPTzJ/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -160,7 +161,7 @@
       "total_excluding_tax": 280000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqY2Z3blNVZTlCc2tHV2FZa3ljUjByajN2M21OLDk4MDI4NjEw0200CSswUna4?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QaFlCMEZ5REowUWxnbHM4Q0NnWm1XTUZ0U1N0LDEwMDA2NTk1OA02003nciPdnl?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqY2Z3blNVZTlCc2tHV2FZa3ljUjByajN2M21OLDk4MDI4NjEw0200CSswUna4/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QaFlCMEZ5REowUWxnbHM4Q0NnWm1XTUZ0U1N0LDEwMDA2NTk1OA02003nciPdnl/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -367,9 +369,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjEw0200svdYYQ9P?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1OA020085z1b41S?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjEw0200svdYYQ9P/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1OA020085z1b41S/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -386,6 +388,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.pay.1.json
index 4b9ac3167e..61bcaa11b7 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAz0200BZNIth66?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mg0200wRkvh2SS?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lqVVFvczJmU1hwZHBQS1lhNTdsR3JDZzVsYmxRLDk4MDI4NjAz0200BZNIth66/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QdWliek5ETU01cXp0aUxFT3FmRkV2UFNJOFU2LDEwMDA2NTk1Mg0200wRkvh2SS/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.create.1.json
index 194de38c04..a468f75c19 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohum8DEQaroqDjsbCOwqYi9_secret_PWyjmq9dgXS89GZhc3MIMjjLO5kivnM",
+  "client_secret": "seti_1OqSmbDEQaroqDjsmfHsurNW_secret_PfoP9MThX3tWCHXMDYqs3xdnds4NBFH",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohum8DEQaroqDjsbCOwqYi9",
+  "id": "seti_1OqSmbDEQaroqDjsmfHsurNW",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohum8DEQaroqDjsUao39gyp",
+  "latest_attempt": "setatt_1OqSmbDEQaroqDjsKMO7qr3j",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+  "payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.list.1.json
index ab876c6d38..2966c10482 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohum7DEQaroqDjsIscMYDHP_secret_PWyjWzdyuADQB9R49D9Ssu7bQJeHe5K",
+      "client_secret": "seti_1OqSmbDEQaroqDjsuRAQGwyP_secret_PfoP2ewvPJnHnDCXJF8kr3D6NWx0qPw",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohum7DEQaroqDjsIscMYDHP",
+      "id": "seti_1OqSmbDEQaroqDjsuRAQGwyP",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.retrieve.1.json
index 194de38c04..a468f75c19 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1Ohum8DEQaroqDjsbCOwqYi9_secret_PWyjmq9dgXS89GZhc3MIMjjLO5kivnM",
+  "client_secret": "seti_1OqSmbDEQaroqDjsmfHsurNW_secret_PfoP9MThX3tWCHXMDYqs3xdnds4NBFH",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1Ohum8DEQaroqDjsbCOwqYi9",
+  "id": "seti_1OqSmbDEQaroqDjsmfHsurNW",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1Ohum8DEQaroqDjsUao39gyp",
+  "latest_attempt": "setatt_1OqSmbDEQaroqDjsKMO7qr3j",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1Ohum8DEQaroqDjsY32iD3tc",
+  "payment_method": "pm_1OqSmbDEQaroqDjs9TirZmtZ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.create.1.json
index f90f0bcfe7..232a4bf90c 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02DU3WT6kC01pnScLQvwbXOaDzcJMegNGboUrywTvViOlRwf",
+  "id": "cs_test_NORMALIZED02Mdm5o2QOgao7pI668SC2jUJVBjJAqQUT1im7SRYyQIUzuP",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohum7DEQaroqDjsIscMYDHP",
+  "setup_intent": "seti_1OqSmbDEQaroqDjsuRAQGwyP",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02DU3WT6kC01pnScLQvwbXOaDzcJMegNGboUrywTvViOlRwf#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Mdm5o2QOgao7pI668SC2jUJVBjJAqQUT1im7SRYyQIUzuP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.list.1.json
index afa5abe3da..93e95780b2 100644
--- a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02DU3WT6kC01pnScLQvwbXOaDzcJMegNGboUrywTvViOlRwf",
+      "id": "cs_test_NORMALIZED02Mdm5o2QOgao7pI668SC2jUJVBjJAqQUT1im7SRYyQIUzuP",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohum7DEQaroqDjsIscMYDHP",
+      "setup_intent": "seti_1OqSmbDEQaroqDjsuRAQGwyP",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02DU3WT6kC01pnScLQvwbXOaDzcJMegNGboUrywTvViOlRwf#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02Mdm5o2QOgao7pI668SC2jUJVBjJAqQUT1im7SRYyQIUzuP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.modify.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.modify.1.json
index e3ae6f0898..4ebe3b583b 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhumODEQaroqDjse9cEFbew",
+    "default_payment_method": "pm_1OqSmqDEQaroqDjs6opE0iw3",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.1.json
index 26f8a57855..162f82bd56 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumODEQaroqDjse9cEFbew",
+      "id": "pm_1OqSmqDEQaroqDjs6opE0iw3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.2.json
index 26f8a57855..162f82bd56 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumODEQaroqDjse9cEFbew",
+      "id": "pm_1OqSmqDEQaroqDjs6opE0iw3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.3.json
index 26f8a57855..162f82bd56 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumODEQaroqDjse9cEFbew",
+      "id": "pm_1OqSmqDEQaroqDjs6opE0iw3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.4.json
index 26f8a57855..162f82bd56 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumODEQaroqDjse9cEFbew",
+      "id": "pm_1OqSmqDEQaroqDjs6opE0iw3",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Event.list.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Event.list.1.json
index 2bb1cb8a9a..31f2b585c2 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhumODEQaroqDjse9cEFbew",
+            "default_payment_method": "pm_1OqSmqDEQaroqDjs6opE0iw3",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhumQDEQaroqDjsdhm2Olof",
+      "id": "evt_1OqSmsDEQaroqDjslutc6AXo",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "41652513-82d9-4589-816f-d14c5c3dbd2b"
+        "idempotency_key": "8cd935df-726b-4d3c-adc9-981d6379a1df"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.create.1.json
index 9d51c7f424..9877eb5ce8 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumODEQaroqDjs1zraIpJA_secret_PWyjGDy2iN97njr1HQwiD7Vl6bkc2Fm",
+  "client_secret": "seti_1OqSmqDEQaroqDjs3ktfrsrT_secret_PfoPbI8Nqu3HzZvxiXoKo6VeVT1mdD7",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumODEQaroqDjs1zraIpJA",
+  "id": "seti_1OqSmqDEQaroqDjs3ktfrsrT",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumODEQaroqDjsGarWGqc1",
+  "latest_attempt": "setatt_1OqSmqDEQaroqDjs068JHgVT",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumODEQaroqDjse9cEFbew",
+  "payment_method": "pm_1OqSmqDEQaroqDjs6opE0iw3",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.list.1.json
index 979c2716bf..40370d87bc 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhumNDEQaroqDjs9WN3AtjE_secret_PWyjNi6vJiaAY90STtR8Tsb83ID9VRh",
+      "client_secret": "seti_1OqSmpDEQaroqDjsjCxn0WKo_secret_PfoPUYKLErKWWNKI9N4etjm6BJtvnAW",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhumNDEQaroqDjs9WN3AtjE",
+      "id": "seti_1OqSmpDEQaroqDjsjCxn0WKo",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.retrieve.1.json
index 9d51c7f424..9877eb5ce8 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumODEQaroqDjs1zraIpJA_secret_PWyjGDy2iN97njr1HQwiD7Vl6bkc2Fm",
+  "client_secret": "seti_1OqSmqDEQaroqDjs3ktfrsrT_secret_PfoPbI8Nqu3HzZvxiXoKo6VeVT1mdD7",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumODEQaroqDjs1zraIpJA",
+  "id": "seti_1OqSmqDEQaroqDjs3ktfrsrT",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumODEQaroqDjsGarWGqc1",
+  "latest_attempt": "setatt_1OqSmqDEQaroqDjs068JHgVT",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumODEQaroqDjse9cEFbew",
+  "payment_method": "pm_1OqSmqDEQaroqDjs6opE0iw3",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.create.1.json
index bcba690775..cf392d6084 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01Xb0qiFIdCGNQg4fM0T9wqTi1ZSKGiPhSgnDNDkxzQrdcB9",
+  "id": "cs_test_NORMALIZED01NUSWZ85bqdT1O6GBbtZ7w0abX3wS5ddopHS8NedlRSgYOD",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhumNDEQaroqDjs9WN3AtjE",
+  "setup_intent": "seti_1OqSmpDEQaroqDjsjCxn0WKo",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01Xb0qiFIdCGNQg4fM0T9wqTi1ZSKGiPhSgnDNDkxzQrdcB9#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01NUSWZ85bqdT1O6GBbtZ7w0abX3wS5ddopHS8NedlRSgYOD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.list.1.json
index 6b1144edde..c2bd2829ff 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01Xb0qiFIdCGNQg4fM0T9wqTi1ZSKGiPhSgnDNDkxzQrdcB9",
+      "id": "cs_test_NORMALIZED01NUSWZ85bqdT1O6GBbtZ7w0abX3wS5ddopHS8NedlRSgYOD",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhumNDEQaroqDjs9WN3AtjE",
+      "setup_intent": "seti_1OqSmpDEQaroqDjsjCxn0WKo",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01Xb0qiFIdCGNQg4fM0T9wqTi1ZSKGiPhSgnDNDkxzQrdcB9#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01NUSWZ85bqdT1O6GBbtZ7w0abX3wS5ddopHS8NedlRSgYOD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.modify.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.modify.1.json
index a489949c49..c8e307fda7 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhumUDEQaroqDjshNm2lFQk",
+    "default_payment_method": "pm_1OqSmvDEQaroqDjsEcYigRqK",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.1.json
index cc0fe7cda5..bee9f76152 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumUDEQaroqDjshNm2lFQk",
+      "id": "pm_1OqSmvDEQaroqDjsEcYigRqK",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.2.json
index cc0fe7cda5..bee9f76152 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumUDEQaroqDjshNm2lFQk",
+      "id": "pm_1OqSmvDEQaroqDjsEcYigRqK",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.3.json
index cc0fe7cda5..bee9f76152 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumUDEQaroqDjshNm2lFQk",
+      "id": "pm_1OqSmvDEQaroqDjsEcYigRqK",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.4.json
index cc0fe7cda5..bee9f76152 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumUDEQaroqDjshNm2lFQk",
+      "id": "pm_1OqSmvDEQaroqDjsEcYigRqK",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Event.list.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Event.list.1.json
index ace4412ed5..21f4bb078a 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhumUDEQaroqDjshNm2lFQk",
+            "default_payment_method": "pm_1OqSmvDEQaroqDjsEcYigRqK",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhumWDEQaroqDjs17BKMjJE",
+      "id": "evt_1OqSmxDEQaroqDjseWn7sD99",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "0937bce8-2768-431a-a1f6-b77f502f62ab"
+        "idempotency_key": "e9bb5145-deae-4c50-b6fb-68efea22e338"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.create.1.json
index 0e0c84a4be..f624d227fb 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumUDEQaroqDjsgeA4hBu2_secret_PWyjO5ExgyulSXshvv0Ro9T0L9ctyQK",
+  "client_secret": "seti_1OqSmvDEQaroqDjsypJro88r_secret_PfoP24O6Z6f7UeVDwNj33vkPvfpeesW",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumUDEQaroqDjsgeA4hBu2",
+  "id": "seti_1OqSmvDEQaroqDjsypJro88r",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumUDEQaroqDjsOHVf9q9B",
+  "latest_attempt": "setatt_1OqSmwDEQaroqDjsVOH2Fz87",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumUDEQaroqDjshNm2lFQk",
+  "payment_method": "pm_1OqSmvDEQaroqDjsEcYigRqK",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.list.1.json
index dc32c8f9c8..c5a5ff51a8 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhumTDEQaroqDjsHIw8hjLj_secret_PWyjxUH6JcuriCG9XBVi9j0YaB5nX2H",
+      "client_secret": "seti_1OqSmvDEQaroqDjsVqo96Jkq_secret_PfoP0vLZkGe7F8YZClS2ZY6XeJXun3o",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhumTDEQaroqDjsHIw8hjLj",
+      "id": "seti_1OqSmvDEQaroqDjsVqo96Jkq",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.retrieve.1.json
index 0e0c84a4be..f624d227fb 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumUDEQaroqDjsgeA4hBu2_secret_PWyjO5ExgyulSXshvv0Ro9T0L9ctyQK",
+  "client_secret": "seti_1OqSmvDEQaroqDjsypJro88r_secret_PfoP24O6Z6f7UeVDwNj33vkPvfpeesW",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumUDEQaroqDjsgeA4hBu2",
+  "id": "seti_1OqSmvDEQaroqDjsypJro88r",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumUDEQaroqDjsOHVf9q9B",
+  "latest_attempt": "setatt_1OqSmwDEQaroqDjsVOH2Fz87",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumUDEQaroqDjshNm2lFQk",
+  "payment_method": "pm_1OqSmvDEQaroqDjsEcYigRqK",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.create.1.json
index d27e9c2f03..5880c29bf4 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01f5nAAWV8fbGWqPFIZL4bt1fby7msIt35idYK1u9FNG5kNP",
+  "id": "cs_test_NORMALIZED01KEvj02WM1NonrkNd17r5bCthNDxclts6IP8v23oPmkkNRj",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhumTDEQaroqDjsHIw8hjLj",
+  "setup_intent": "seti_1OqSmvDEQaroqDjsVqo96Jkq",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01f5nAAWV8fbGWqPFIZL4bt1fby7msIt35idYK1u9FNG5kNP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01KEvj02WM1NonrkNd17r5bCthNDxclts6IP8v23oPmkkNRj#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.list.1.json
index 42dc522353..d2621ba09b 100644
--- a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01f5nAAWV8fbGWqPFIZL4bt1fby7msIt35idYK1u9FNG5kNP",
+      "id": "cs_test_NORMALIZED01KEvj02WM1NonrkNd17r5bCthNDxclts6IP8v23oPmkkNRj",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhumTDEQaroqDjsHIw8hjLj",
+      "setup_intent": "seti_1OqSmvDEQaroqDjsVqo96Jkq",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01f5nAAWV8fbGWqPFIZL4bt1fby7msIt35idYK1u9FNG5kNP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01KEvj02WM1NonrkNd17r5bCthNDxclts6IP8v23oPmkkNRj#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.create_balance_transaction.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.create_balance_transaction.1.json
index 135806c651..037f189963 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.create_balance_transaction.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.create_balance_transaction.1.json
@@ -1,11 +1,11 @@
 {
-  "amount": -3311,
+  "amount": -3073,
   "created": 1000000000,
   "credit_note": null,
   "currency": "usd",
   "customer": "cus_NORMALIZED0001",
   "description": "Credit from early termination of active plan",
-  "ending_balance": -3311,
+  "ending_balance": -3073,
   "id": "cbtxn_NORMALIZED00000000000001",
   "invoice": null,
   "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.modify.1.json
index abac620131..d8abecac3b 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+    "default_payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.1.json
index 41753df900..fcf3c977b2 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+      "id": "pm_1OqSuFDEQaroqDjscGbSJ539",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.2.json
index 41753df900..fcf3c977b2 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+      "id": "pm_1OqSuFDEQaroqDjscGbSJ539",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.3.json
index 41753df900..fcf3c977b2 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+      "id": "pm_1OqSuFDEQaroqDjscGbSJ539",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.4.json
index 41753df900..fcf3c977b2 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+      "id": "pm_1OqSuFDEQaroqDjscGbSJ539",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.1.json
index e4409ef92d..6d31fd4e35 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+            "default_payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuszDEQaroqDjs7h63HJAQ",
+      "id": "evt_1OqSuHDEQaroqDjsQmuIxt83",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "36faca3c-664f-4645-94b6-af01f1dd5772"
+        "idempotency_key": "7d95a35e-1fa5-451a-952b-e77190cb6a6a"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.2.json
index 1eb789c561..326678045a 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+                "payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOLnmK4GMgaUKspI68U6LBZ_7RQ_F5pyXhtuWXt_u7PNKJrMOXqPRXolRLehV3hwUuaZCReR8TuFj56G?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKPqUla8GMgbIEdp4N3w6LBboRwyzdgDw626s7vuSkZlwLrE5JE0zUn-RZifXCgQCy9vAt1z1Pe0vu2k4?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_3up8sc6qSyVY7jRMXCQAPRWUO",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_jaONYgm4fN1EM72vfgqepp3la",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+          "payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohut2DEQaroqDjs1Zzqjp4S",
+      "id": "evt_3OqSuKDEQaroqDjs0lp0aEn8",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "254a6e39-eced-46c0-8d3f-aeb26c28026b"
+        "idempotency_key": "c6d3f9b1-417b-46ca-955f-30e8be82a3e9"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000002",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKPqUla8GMgaSpGONodY6LBY5f9COkvTlmx3lV5FxMHAjnnFtqnVzSeUgVtxCnRGYENmfXHbeJFMXjaXR?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSuKDEQaroqDjs0vtJMwaS",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "c6d3f9b1-417b-46ca-955f-30e8be82a3e9"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI10200ABmYO1yZ?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNQ0200l0XldTpF?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI10200ABmYO1yZ/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNQ0200l0XldTpF/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -361,16 +490,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohut3DEQaroqDjsTvezKim9",
+      "id": "evt_1OqSuLDEQaroqDjsGuSet9y6",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "3abeb13b-2885-4f6c-a3f9-8d581db3af05"
+        "idempotency_key": "b47860c7-6ff2-4682-a9d1-759c6415f5b5"
       },
       "type": "invoice.finalized"
     },
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI10200ABmYO1yZ?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNQ0200l0XldTpF?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI10200ABmYO1yZ/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNQ0200l0XldTpF/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -544,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -564,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1Ohut3DEQaroqDjse8zKnzRM",
+      "id": "evt_1OqSuLDEQaroqDjs2lnmoXJ9",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "3abeb13b-2885-4f6c-a3f9-8d581db3af05"
+        "idempotency_key": "b47860c7-6ff2-4682-a9d1-759c6415f5b5"
       },
       "type": "invoice.updated"
     },
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_3up8sc6qSyVY7jRMXCQAPRWUO",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_jaONYgm4fN1EM72vfgqepp3la",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -641,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohut2DEQaroqDjs1HgWBUrJ",
+      "id": "evt_3OqSuKDEQaroqDjs0h4ONL6J",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "3abeb13b-2885-4f6c-a3f9-8d581db3af05"
+        "idempotency_key": "b47860c7-6ff2-4682-a9d1-759c6415f5b5"
       },
       "type": "payment_intent.created"
     },
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -821,16 +952,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohut2DEQaroqDjs6pCnjkaA",
+      "id": "evt_1OqSuKDEQaroqDjsdTQG99uz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "c6af8dbc-b79e-4252-a45c-3469adc1bd6d"
+        "idempotency_key": "d3e54733-cdce-4714-ada2-89141c98e6b7"
       },
       "type": "invoice.created"
     },
@@ -886,13 +1017,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1Ohut1DEQaroqDjsY1nPajFH",
+      "id": "evt_1OqSuJDEQaroqDjssibIvuVF",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "c19c9c0f-ce70-412e-a22a-1c94f5bdbc67"
+        "idempotency_key": "4b4e6545-b842-42dc-a7c1-cee3ebccb5c8"
       },
       "type": "invoiceitem.created"
     },
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+            "default_payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1Ohut1DEQaroqDjs7F8CY6q2",
+      "id": "evt_1OqSuJDEQaroqDjslkaWycQ8",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "c19c9c0f-ce70-412e-a22a-1c94f5bdbc67"
+        "idempotency_key": "4b4e6545-b842-42dc-a7c1-cee3ebccb5c8"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.3.json
index 32f72681fd..30252e1412 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI30200YDqYYBdO?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI30200YDqYYBdO/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -170,16 +171,200 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohut5DEQaroqDjskCMLz7hU",
+      "id": "evt_1OqSuMDEQaroqDjsuiUasCEC",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "254a6e39-eced-46c0-8d3f-aeb26c28026b"
+        "idempotency_key": "c6d3f9b1-417b-46ca-955f-30e8be82a3e9"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSuMDEQaroqDjsEEo4vd8B",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "c6d3f9b1-417b-46ca-955f-30e8be82a3e9"
       },
       "type": "invoice.paid"
     },
@@ -230,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI30200YDqYYBdO?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI30200YDqYYBdO/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -353,7 +539,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -368,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1Ohut5DEQaroqDjsOEABo8nW",
+      "id": "evt_1OqSuMDEQaroqDjs6lVdNytj",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "254a6e39-eced-46c0-8d3f-aeb26c28026b"
+        "idempotency_key": "c6d3f9b1-417b-46ca-955f-30e8be82a3e9"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.4.json
index af627f5ea5..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.4.json
@@ -1,189 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI30200YDqYYBdO?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI30200YDqYYBdO/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1Ohut5DEQaroqDjsYnz96B1R",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "254a6e39-eced-46c0-8d3f-aeb26c28026b"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.1.json
index f4f30938d0..347fe6644d 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.2.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.2.json
index 85a412cef6..8ef239bab5 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.2.json
@@ -2,9 +2,9 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 92689,
+  "amount_due": 92927,
   "amount_paid": 0,
-  "amount_remaining": 92689,
+  "amount_remaining": 92927,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -136,7 +137,7 @@
   "rendering_options": null,
   "shipping_cost": null,
   "shipping_details": null,
-  "starting_balance": -3311,
+  "starting_balance": -3073,
   "statement_descriptor": "Zulip Cloud Plus",
   "status": "draft",
   "status_transitions": {
@@ -158,5 +159,5 @@
   "total_excluding_tax": 96000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.1.json
index 3bc563f994..a678cfcdd4 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI00200Ogl38yIP?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNA0200G4R7KwYu?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI00200Ogl38yIP/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNA0200G4R7KwYu/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.2.json
index 8d87a072c8..a9eed2b8ca 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.2.json
@@ -2,9 +2,9 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 92689,
+  "amount_due": 92927,
   "amount_paid": 0,
-  "amount_remaining": 92689,
+  "amount_remaining": 92927,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxeXZIRmFISTVleUs2RUlGbjlHQ3k0S0ZYOFc5LDk4MDI5MDMw0200tnu2pTeN?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDdUWVVVeEhnMFF5VGNjTkJYZTJuRmswU3VVLDEwMDA2NjQyOQ0200tafqDkQO?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxeXZIRmFISTVleUs2RUlGbjlHQ3k0S0ZYOFc5LDk4MDI5MDMw0200tnu2pTeN/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDdUWVVVeEhnMFF5VGNjTkJYZTJuRmswU3VVLDEwMDA2NjQyOQ0200tafqDkQO/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -136,7 +137,7 @@
   "rendering_options": null,
   "shipping_cost": null,
   "shipping_details": null,
-  "starting_balance": -3311,
+  "starting_balance": -3073,
   "statement_descriptor": "Zulip Cloud Plus",
   "status": "open",
   "status_transitions": {
@@ -158,5 +159,5 @@
   "total_excluding_tax": 96000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.pay.1.json
index 0fff955c05..75cd5fbc01 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI20200Qvr3qtZw?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lxZ1ZicklxZW03cENWZnRyUG5LUExmYlFmSmNxLDk4MDI5MDI20200Qvr3qtZw/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9YcDJYQUliOFZuUXlKUlZnakJuRmlPSldtbk1nLDEwMDA2NjQyNg0200bkHlL5qD/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.create.1.json
index 55b4b01268..51ef9fecb8 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusxDEQaroqDjs0kTicG4v_secret_PWyqWqCbJzh0IbtNW41142XeU3nISry",
+  "client_secret": "seti_1OqSuFDEQaroqDjsHPHVBrga_secret_PfoXBRRPTc5RCDzlG7DggcqDKwrTo4e",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusxDEQaroqDjs0kTicG4v",
+  "id": "seti_1OqSuFDEQaroqDjsHPHVBrga",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusxDEQaroqDjsL6hK2SI4",
+  "latest_attempt": "setatt_1OqSuFDEQaroqDjsuEoyLajm",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+  "payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.list.1.json
index 8508232468..55f6f5cd20 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuswDEQaroqDjsdupePImO_secret_PWyqSclaw5XrgKcKC9kY6jb7fCAF5LX",
+      "client_secret": "seti_1OqSuEDEQaroqDjsFmP8A0CZ_secret_PfoXoMSIVYIDKahvcMHz0Jdju0ql8PV",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuswDEQaroqDjsdupePImO",
+      "id": "seti_1OqSuEDEQaroqDjsFmP8A0CZ",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.retrieve.1.json
index 55b4b01268..51ef9fecb8 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusxDEQaroqDjs0kTicG4v_secret_PWyqWqCbJzh0IbtNW41142XeU3nISry",
+  "client_secret": "seti_1OqSuFDEQaroqDjsHPHVBrga_secret_PfoXBRRPTc5RCDzlG7DggcqDKwrTo4e",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusxDEQaroqDjs0kTicG4v",
+  "id": "seti_1OqSuFDEQaroqDjsHPHVBrga",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusxDEQaroqDjsL6hK2SI4",
+  "latest_attempt": "setatt_1OqSuFDEQaroqDjsuEoyLajm",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusxDEQaroqDjsB1fBIbOe",
+  "payment_method": "pm_1OqSuFDEQaroqDjscGbSJ539",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.create.1.json
index e28a25e314..ec108d3979 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED024Rbl6SMNamVCgY92xBQPUZIFtDiS3L8OxG4g3YFWkCMfJE",
+  "id": "cs_test_NORMALIZED02533HhgpBKy6jzXAcZzCRQksbNQBX2MJAzG7wu7WyjmZaH0",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuswDEQaroqDjsdupePImO",
+  "setup_intent": "seti_1OqSuEDEQaroqDjsFmP8A0CZ",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED024Rbl6SMNamVCgY92xBQPUZIFtDiS3L8OxG4g3YFWkCMfJE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02533HhgpBKy6jzXAcZzCRQksbNQBX2MJAzG7wu7WyjmZaH0#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.list.1.json
index bf4dd2067a..c97ec3517e 100644
--- a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED024Rbl6SMNamVCgY92xBQPUZIFtDiS3L8OxG4g3YFWkCMfJE",
+      "id": "cs_test_NORMALIZED02533HhgpBKy6jzXAcZzCRQksbNQBX2MJAzG7wu7WyjmZaH0",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuswDEQaroqDjsdupePImO",
+      "setup_intent": "seti_1OqSuEDEQaroqDjsFmP8A0CZ",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED024Rbl6SMNamVCgY92xBQPUZIFtDiS3L8OxG4g3YFWkCMfJE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02533HhgpBKy6jzXAcZzCRQksbNQBX2MJAzG7wu7WyjmZaH0#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.1.json
index 629945d3f1..593a07ed0c 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.1.json
@@ -2,9 +2,9 @@
   "address": null,
   "balance": 0,
   "created": 1000000000,
-  "currency": "usd",
-  "default_currency": "usd",
-  "default_source": "src_NORMALIZED00000000000001",
+  "currency": null,
+  "default_currency": null,
+  "default_source": null,
   "delinquent": false,
   "description": "zulip (Zulip Dev)",
   "discount": null,
@@ -23,7 +23,7 @@
     "realm_str": "zulip"
   },
   "name": null,
-  "next_invoice_sequence": 3,
+  "next_invoice_sequence": 1,
   "object": "customer",
   "phone": null,
   "preferred_locales": [],
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.2.json
index 67c06952f2..629945d3f1 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.2.json
@@ -23,7 +23,7 @@
     "realm_str": "zulip"
   },
   "name": null,
-  "next_invoice_sequence": 4,
+  "next_invoice_sequence": 3,
   "object": "customer",
   "phone": null,
   "preferred_locales": [],
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.3.json
new file mode 100644
index 0000000000..67c06952f2
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.3.json
@@ -0,0 +1,33 @@
+{
+  "address": null,
+  "balance": 0,
+  "created": 1000000000,
+  "currency": "usd",
+  "default_currency": "usd",
+  "default_source": "src_NORMALIZED00000000000001",
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
+  "invoice_settings": {
+    "custom_fields": null,
+    "default_payment_method": null,
+    "footer": null,
+    "rendering_options": null
+  },
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "name": null,
+  "next_invoice_sequence": 4,
+  "object": "customer",
+  "phone": null,
+  "preferred_locales": [],
+  "shipping": null,
+  "tax_exempt": "none",
+  "test_clock": null
+}
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.1.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.1.json
index c1e071b02e..b185bc0aa9 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA02",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhumUDEQaroqDjshNm2lFQk",
+            "default_payment_method": "pm_1OqSmvDEQaroqDjsEcYigRqK",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhumWDEQaroqDjs17BKMjJE",
+      "id": "evt_1OqSmxDEQaroqDjseWn7sD99",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "0937bce8-2768-431a-a1f6-b77f502f62ab"
+        "idempotency_key": "e9bb5145-deae-4c50-b6fb-68efea22e338"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.6.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.2.json
similarity index 60%
rename from corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.6.json
rename to corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.2.json
index e1add1796a..47bd8a9ec4 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.6.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.2.json
@@ -8,14 +8,14 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
+          "amount_due": 800000,
+          "amount_paid": 0,
+          "amount_remaining": 800000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
+          "attempt_count": 0,
+          "attempted": false,
           "auto_advance": false,
           "automatic_tax": {
             "enabled": false,
@@ -23,8 +23,8 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
+          "charge": null,
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -42,14 +42,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
+          "due_date": 1000000000,
           "effective_at": 1000000000,
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3NA02006EU3atPk?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3NA02006EU3atPk/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -58,14 +58,15 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 800000,
+                "amount_excluding_tax": 800000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -100,7 +101,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 100,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -116,18 +117,18 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "100",
             "plan_tier": "1",
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0003",
+          "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
+          "paid_out_of_band": true,
+          "payment_intent": null,
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -161,220 +162,35 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 800000,
+          "subtotal_excluding_tax": 800000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 800000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhunaDEQaroqDjsSoWWxERV",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "95217da2-3c4d-4158-b903-588fb8f1b1ac"
-      },
-      "type": "invoice.paid"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0003",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 800000,
           "total_tax_amounts": [],
           "transfer_data": null,
           "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "attempt_count": 0,
-          "attempted": false,
-          "charge": null,
+          "auto_advance": true,
           "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "status": "open",
           "status_transitions": {
             "paid_at": null
           }
         }
       },
-      "id": "evt_1OhunaDEQaroqDjsOcXARU29",
+      "id": "evt_1OqSn4DEQaroqDjsWv9VRZVB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "95217da2-3c4d-4158-b903-588fb8f1b1ac"
+        "idempotency_key": "94efdc44-bf1c-4d8f-b8a4-dc4d8955321c"
       },
       "type": "invoice.updated"
     },
@@ -383,709 +199,7 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "amount": 48000,
-          "amount_capturable": 0,
-          "amount_details": {
-            "tip": {}
-          },
-          "amount_received": 48000,
-          "application": null,
-          "application_fee_amount": null,
-          "automatic_payment_methods": null,
-          "canceled_at": null,
-          "cancellation_reason": null,
-          "capture_method": "automatic",
-          "charges": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_captured": 48000,
-                "amount_refunded": 0,
-                "application": null,
-                "application_fee": null,
-                "application_fee_amount": null,
-                "balance_transaction": "txn_NORMALIZED00000000000002",
-                "billing_details": {
-                  "address": {
-                    "city": null,
-                    "country": null,
-                    "line1": null,
-                    "line2": null,
-                    "postal_code": null,
-                    "state": null
-                  },
-                  "email": null,
-                  "name": null,
-                  "phone": null
-                },
-                "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
-                "captured": true,
-                "created": 1000000000,
-                "currency": "usd",
-                "customer": "cus_NORMALIZED0001",
-                "description": "Payment for Invoice",
-                "destination": null,
-                "dispute": null,
-                "disputed": false,
-                "failure_balance_transaction": null,
-                "failure_code": null,
-                "failure_message": null,
-                "fraud_details": {},
-                "id": "ch_NORMALIZED00000000000001",
-                "invoice": "in_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "charge",
-                "on_behalf_of": null,
-                "order": null,
-                "outcome": {
-                  "network_status": "approved_by_network",
-                  "reason": null,
-                  "risk_level": "normal",
-                  "risk_score": 0,
-                  "seller_message": "Payment complete.",
-                  "type": "authorized"
-                },
-                "paid": true,
-                "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-                "payment_method_details": {
-                  "card": {
-                    "amount_authorized": 48000,
-                    "brand": "visa",
-                    "checks": {
-                      "address_line1_check": null,
-                      "address_postal_code_check": null,
-                      "cvc_check": "pass"
-                    },
-                    "country": "US",
-                    "exp_month": 2,
-                    "exp_year": 2025,
-                    "extended_authorization": {
-                      "status": "disabled"
-                    },
-                    "fingerprint": "NORMALIZED000001",
-                    "funding": "credit",
-                    "incremental_authorization": {
-                      "status": "unavailable"
-                    },
-                    "installments": null,
-                    "last4": "4242",
-                    "mandate": null,
-                    "multicapture": {
-                      "status": "unavailable"
-                    },
-                    "network": "visa",
-                    "network_token": {
-                      "used": false
-                    },
-                    "overcapture": {
-                      "maximum_amount_capturable": 48000,
-                      "status": "unavailable"
-                    },
-                    "three_d_secure": null,
-                    "wallet": null
-                  },
-                  "type": "card"
-                },
-                "radar_options": {},
-                "receipt_email": "hamlet@zulip.com",
-                "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKI3lmK4GMgb_scQib8g6LBZrRRe2yMZQhDwJP5-rHGxXVIphjcn5kemcvv0tEdmnDBn-BY2WL_IzPTzT?s=ap",
-                "refunded": false,
-                "refunds": {
-                  "data": [],
-                  "has_more": false,
-                  "object": "list",
-                  "total_count": 0,
-                  "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
-                },
-                "review": null,
-                "shipping": null,
-                "source": null,
-                "source_transfer": null,
-                "statement_descriptor": "Zulip Cloud Standard",
-                "statement_descriptor_suffix": null,
-                "status": "succeeded",
-                "transfer_data": null,
-                "transfer_group": null
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
-          },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_ujKkALu3NC1rEZaTvSnjzcNaV",
-          "confirmation_method": "automatic",
-          "created": 1000000000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000001",
-          "invoice": "in_NORMALIZED00000000000001",
-          "last_payment_error": null,
-          "latest_charge": "ch_NORMALIZED00000000000001",
-          "livemode": false,
-          "metadata": {},
-          "next_action": null,
-          "object": "payment_intent",
-          "on_behalf_of": null,
-          "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-          "payment_method_configuration_details": null,
-          "payment_method_options": {
-            "card": {
-              "installments": null,
-              "mandate_options": null,
-              "network": null,
-              "request_three_d_secure": "automatic"
-            },
-            "cashapp": {}
-          },
-          "payment_method_types": [
-            "card",
-            "cashapp"
-          ],
-          "processing": null,
-          "receipt_email": "hamlet@zulip.com",
-          "review": null,
-          "setup_future_usage": null,
-          "shipping": null,
-          "source": null,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "statement_descriptor_suffix": null,
-          "status": "succeeded",
-          "transfer_data": null,
-          "transfer_group": null
-        }
-      },
-      "id": "evt_3OhunXDEQaroqDjs1e3Ouwbn",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "95217da2-3c4d-4158-b903-588fb8f1b1ac"
-      },
-      "type": "payment_intent.succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
-          "amount_captured": 48000,
-          "amount_refunded": 0,
-          "application": null,
-          "application_fee": null,
-          "application_fee_amount": null,
-          "balance_transaction": "txn_NORMALIZED00000000000002",
-          "billing_details": {
-            "address": {
-              "city": null,
-              "country": null,
-              "line1": null,
-              "line2": null,
-              "postal_code": null,
-              "state": null
-            },
-            "email": null,
-            "name": null,
-            "phone": null
-          },
-          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
-          "captured": true,
-          "created": 1000000000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "description": "Payment for Invoice",
-          "destination": null,
-          "dispute": null,
-          "disputed": false,
-          "failure_balance_transaction": null,
-          "failure_code": null,
-          "failure_message": null,
-          "fraud_details": {},
-          "id": "ch_NORMALIZED00000000000001",
-          "invoice": "in_NORMALIZED00000000000001",
-          "livemode": false,
-          "metadata": {},
-          "object": "charge",
-          "on_behalf_of": null,
-          "order": null,
-          "outcome": {
-            "network_status": "approved_by_network",
-            "reason": null,
-            "risk_level": "normal",
-            "risk_score": 0,
-            "seller_message": "Payment complete.",
-            "type": "authorized"
-          },
-          "paid": true,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-          "payment_method_details": {
-            "card": {
-              "amount_authorized": 48000,
-              "brand": "visa",
-              "checks": {
-                "address_line1_check": null,
-                "address_postal_code_check": null,
-                "cvc_check": "pass"
-              },
-              "country": "US",
-              "exp_month": 2,
-              "exp_year": 2025,
-              "extended_authorization": {
-                "status": "disabled"
-              },
-              "fingerprint": "NORMALIZED000001",
-              "funding": "credit",
-              "incremental_authorization": {
-                "status": "unavailable"
-              },
-              "installments": null,
-              "last4": "4242",
-              "mandate": null,
-              "multicapture": {
-                "status": "unavailable"
-              },
-              "network": "visa",
-              "network_token": {
-                "used": false
-              },
-              "overcapture": {
-                "maximum_amount_capturable": 48000,
-                "status": "unavailable"
-              },
-              "three_d_secure": null,
-              "wallet": null
-            },
-            "type": "card"
-          },
-          "radar_options": {},
-          "receipt_email": "hamlet@zulip.com",
-          "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKI7lmK4GMgYqnbzN6aU6LBb_XTv-jF93XzEEx79aSROqup3q7C890EA4NIHolVr3fi_W1j2wKiLAqbYx?s=ap",
-          "refunded": false,
-          "refunds": {
-            "data": [],
-            "has_more": false,
-            "object": "list",
-            "total_count": 0,
-            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
-          },
-          "review": null,
-          "shipping": null,
-          "source": null,
-          "source_transfer": null,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "statement_descriptor_suffix": null,
-          "status": "succeeded",
-          "transfer_data": null,
-          "transfer_group": null
-        }
-      },
-      "id": "evt_3OhunXDEQaroqDjs1Ev0w8fI",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "95217da2-3c4d-4158-b903-588fb8f1b1ac"
-      },
-      "type": "charge.succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg00200cM7IXNei?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg00200cM7IXNei/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0003",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhunYDEQaroqDjs6HS6vjcl",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0007",
-        "idempotency_key": "f7e05be4-9e15-45d5-ac0c-d33c3376f67f"
-      },
-      "type": "invoice.finalized"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njgz02000IZ5m7iO?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njgz02000IZ5m7iO/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0003",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        },
-        "previous_attributes": {
-          "effective_at": null,
-          "ending_balance": null,
-          "hosted_invoice_url": null,
-          "invoice_pdf": null,
-          "number": null,
-          "payment_intent": null,
-          "rendering": {
-            "pdf": {
-              "page_size": "auto"
-            }
-          },
-          "status": "draft",
-          "status_transitions": {
-            "finalized_at": null
-          }
-        }
-      },
-      "id": "evt_1OhunXDEQaroqDjsLS9yZITd",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0007",
-        "idempotency_key": "f7e05be4-9e15-45d5-ac0c-d33c3376f67f"
-      },
-      "type": "invoice.updated"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
+          "amount": 800000,
           "amount_capturable": 0,
           "amount_details": {
             "tip": {}
@@ -1094,8 +208,8 @@
           "application": null,
           "application_fee_amount": null,
           "automatic_payment_methods": null,
-          "canceled_at": null,
-          "cancellation_reason": null,
+          "canceled_at": 1000000000,
+          "cancellation_reason": "requested_by_customer",
           "capture_method": "automatic",
           "charges": {
             "data": [],
@@ -1104,7 +218,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_ujKkALu3NC1rEZaTvSnjzcNaV",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_NxG5i6s0Tt2QF9aWvk4GMJ49g",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -1128,11 +242,17 @@
               "network": null,
               "request_three_d_secure": "automatic"
             },
-            "cashapp": {}
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
           },
           "payment_method_types": [
+            "ach_credit_transfer",
             "card",
-            "cashapp"
+            "cashapp",
+            "wechat_pay"
           ],
           "processing": null,
           "receipt_email": "hamlet@zulip.com",
@@ -1142,20 +262,20 @@
           "source": null,
           "statement_descriptor": "Zulip Cloud Standard",
           "statement_descriptor_suffix": null,
-          "status": "requires_payment_method",
+          "status": "canceled",
           "transfer_data": null,
           "transfer_group": null
         }
       },
-      "id": "evt_3OhunXDEQaroqDjs1FmB2KQo",
+      "id": "evt_3OqSn2DEQaroqDjs0AKdlGl5",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0007",
-        "idempotency_key": "f7e05be4-9e15-45d5-ac0c-d33c3376f67f"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "94efdc44-bf1c-4d8f-b8a4-dc4d8955321c"
       },
-      "type": "payment_intent.created"
+      "type": "payment_intent.canceled"
     },
     {
       "api_version": "2020-08-27",
@@ -1165,15 +285,15 @@
           "account_country": "US",
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
-          "amount_due": 48000,
+          "amount_due": 800000,
           "amount_paid": 0,
-          "amount_remaining": 48000,
+          "amount_remaining": 800000,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
           "attempt_count": 0,
           "attempted": false,
-          "auto_advance": false,
+          "auto_advance": true,
           "automatic_tax": {
             "enabled": false,
             "liability": null,
@@ -1181,7 +301,7 @@
           },
           "billing_reason": "manual",
           "charge": null,
-          "collection_method": "charge_automatically",
+          "collection_method": "send_invoice",
           "created": 1000000000,
           "currency": "usd",
           "custom_fields": null,
@@ -1199,14 +319,14 @@
           "description": null,
           "discount": null,
           "discounts": [],
-          "due_date": null,
-          "effective_at": null,
-          "ending_balance": null,
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": null,
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -1215,14 +335,15 @@
           "lines": {
             "data": [
               {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
+                "amount": 800000,
+                "amount_excluding_tax": 800000,
                 "currency": "usd",
                 "description": "Zulip Cloud Standard",
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -1257,7 +378,7 @@
                 "proration_details": {
                   "credited_items": null
                 },
-                "quantity": 6,
+                "quantity": 100,
                 "subscription": null,
                 "tax_amounts": [],
                 "tax_rates": [],
@@ -1273,8 +394,476 @@
           "livemode": false,
           "metadata": {
             "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
+            "license_management": "manual",
+            "licenses": "100",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 800000,
+          "subtotal_excluding_tax": 800000,
+          "tax": null,
+          "test_clock": null,
+          "total": 800000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 800000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSn3DEQaroqDjspdmCy2mh",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "aed0d50e-a45c-4e74-9d83-3ece04327266"
+      },
+      "type": "invoice.finalized"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 800000,
+          "amount_paid": 0,
+          "amount_remaining": 800000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 800000,
+                "amount_excluding_tax": 800000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 100,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "100",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 800000,
+          "subtotal_excluding_tax": 800000,
+          "tax": null,
+          "test_clock": null,
+          "total": 800000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 800000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "effective_at": null,
+          "ending_balance": null,
+          "hosted_invoice_url": null,
+          "invoice_pdf": null,
+          "number": null,
+          "payment_intent": null,
+          "rendering": {
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null
+          }
+        }
+      },
+      "id": "evt_1OqSn3DEQaroqDjstZXl1ieM",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "aed0d50e-a45c-4e74-9d83-3ece04327266"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 800000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": null,
+          "cancellation_reason": null,
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+          },
+          "client_secret": "pi_NORMALIZED00000000000001_secret_NxG5i6s0Tt2QF9aWvk4GMJ49g",
+          "confirmation_method": "automatic",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
+          },
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "requires_payment_method",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSn2DEQaroqDjs06cwSNcH",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "aed0d50e-a45c-4e74-9d83-3ece04327266"
+      },
+      "type": "payment_intent.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 800000,
+          "amount_paid": 0,
+          "amount_remaining": 800000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": null,
+          "ending_balance": null,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": null,
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": null,
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 800000,
+                "amount_excluding_tax": 800000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 100,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "100",
             "plan_tier": "1",
             "user_id": "10"
           },
@@ -1318,25 +907,25 @@
           "subscription_details": {
             "metadata": null
           },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
+          "subtotal": 800000,
+          "subtotal_excluding_tax": 800000,
           "tax": null,
           "test_clock": null,
-          "total": 48000,
+          "total": 800000,
           "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
+          "total_excluding_tax": 800000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhunWDEQaroqDjsqBtUhqJs",
+      "id": "evt_1OqSn2DEQaroqDjsEGOIZnAw",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0008",
-        "idempotency_key": "ba223ff0-3b61-4cac-8f41-a6958a7db136"
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "cca4e628-ba48-4260-b41e-6e4061dd2b7a"
       },
       "type": "invoice.created"
     },
@@ -1345,7 +934,7 @@
       "created": 1000000000,
       "data": {
         "object": {
-          "amount": 48000,
+          "amount": 800000,
           "currency": "usd",
           "customer": "cus_NORMALIZED0001",
           "date": 1000000000,
@@ -1384,7 +973,7 @@
             "unit_amount_decimal": "8000"
           },
           "proration": false,
-          "quantity": 6,
+          "quantity": 100,
           "subscription": null,
           "tax_rates": [],
           "test_clock": null,
@@ -1392,13 +981,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhunWDEQaroqDjsApcDSzi5",
+      "id": "evt_1OqSn2DEQaroqDjsiBxu232Q",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0009",
-        "idempotency_key": "7761358b-c9de-4059-bcf8-795e97b253cc"
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "597c1d86-ab2e-48a2-9fbe-a2046b396c72"
       },
       "type": "invoiceitem.created"
     },
@@ -1421,7 +1010,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+            "default_payment_method": null,
             "footer": null,
             "rendering_options": null
           },
@@ -1444,18 +1033,66 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhunWDEQaroqDjsBsddnPDx",
+      "id": "evt_1OqSn2DEQaroqDjsBt0oD5XU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0009",
-        "idempotency_key": "7761358b-c9de-4059-bcf8-795e97b253cc"
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "597c1d86-ab2e-48a2-9fbe-a2046b396c72"
       },
       "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": null,
+          "default_currency": null,
+          "default_source": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        }
+      },
+      "id": "evt_1OqSn1DEQaroqDjs5iTbSdEa",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0006",
+        "idempotency_key": "d513d5a5-f694-4902-84c9-55c2b933d925"
+      },
+      "type": "customer.created"
     }
   ],
-  "has_more": true,
+  "has_more": false,
   "object": "list",
   "url": "/v1/events"
 }
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.3.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.3.json
new file mode 100644
index 0000000000..8556e816d9
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.3.json
@@ -0,0 +1,301 @@
+{
+  "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "ach_credit_transfer": {
+            "account_number": "test_NORMALIZED02",
+            "bank_name": "TEST BANK",
+            "fingerprint": "NORMALIZED000001",
+            "refund_account_holder_name": null,
+            "refund_account_holder_type": null,
+            "refund_routing_number": null,
+            "routing_number": "110000000",
+            "swift_code": "TSTEZ122"
+          },
+          "amount": null,
+          "client_secret": "src_client_secret_NORMALIZED00000000000001",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "flow": "receiver",
+          "id": "src_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "source",
+          "owner": {
+            "address": null,
+            "email": "amount_0@stripe.com",
+            "name": null,
+            "phone": null,
+            "verified_address": null,
+            "verified_email": null,
+            "verified_name": null,
+            "verified_phone": null
+          },
+          "receiver": {
+            "address": "000000000-test_NORMALIZED01",
+            "amount_charged": 0,
+            "amount_received": 0,
+            "amount_returned": 0,
+            "refund_attributes_method": "email",
+            "refund_attributes_status": "missing"
+          },
+          "statement_descriptor": null,
+          "status": "pending",
+          "type": "ach_credit_transfer",
+          "usage": "reusable"
+        }
+      },
+      "id": "evt_1OqSn4DEQaroqDjsUazFZBDS",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "075df191-3142-489f-bb7e-859ea2310cdb"
+      },
+      "type": "customer.source.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": "usd",
+          "default_currency": "usd",
+          "default_source": "src_NORMALIZED00000000000001",
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 2,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "default_source": null
+        }
+      },
+      "id": "evt_1OqSn4DEQaroqDjsNIKjB4mg",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "075df191-3142-489f-bb7e-859ea2310cdb"
+      },
+      "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 800000,
+          "amount_paid": 0,
+          "amount_remaining": 800000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3NA02006EU3atPk?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3NA02006EU3atPk/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 800000,
+                "amount_excluding_tax": 800000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 100,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "100",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": true,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 800000,
+          "subtotal_excluding_tax": 800000,
+          "tax": null,
+          "test_clock": null,
+          "total": 800000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 800000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSn4DEQaroqDjs8dCpmk6O",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "94efdc44-bf1c-4d8f-b8a4-dc4d8955321c"
+      },
+      "type": "invoice.paid"
+    }
+  ],
+  "has_more": false,
+  "object": "list",
+  "url": "/v1/events"
+}
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.4.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.4.json
new file mode 100644
index 0000000000..03bea9aad9
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.4.json
@@ -0,0 +1,101 @@
+{
+  "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "after_expiration": null,
+          "allow_promotion_codes": null,
+          "amount_subtotal": null,
+          "amount_total": null,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_address_collection": "required",
+          "cancel_url": "http://zulip.testserver/upgrade/?manual_license_management=false&tier=1",
+          "client_reference_id": null,
+          "client_secret": null,
+          "consent": null,
+          "consent_collection": null,
+          "created": 1000000000,
+          "currency": null,
+          "currency_conversion": null,
+          "custom_fields": [],
+          "custom_text": {
+            "after_submit": null,
+            "shipping_address": null,
+            "submit": null,
+            "terms_of_service_acceptance": null
+          },
+          "customer": "cus_NORMALIZED0003",
+          "customer_creation": null,
+          "customer_details": {
+            "address": null,
+            "email": "hamlet@zulip.com",
+            "name": null,
+            "phone": null,
+            "tax_exempt": null,
+            "tax_ids": null
+          },
+          "customer_email": null,
+          "expires_at": 1000000000,
+          "id": "cs_test_NORMALIZED03T3fKczITtLsYzJwYoGKwkyL3Xf6rAG0BNx8sabjsSOcJr1",
+          "invoice": null,
+          "invoice_creation": null,
+          "livemode": false,
+          "locale": null,
+          "metadata": {
+            "type": "card_update",
+            "user_id": "10"
+          },
+          "mode": "setup",
+          "object": "checkout.session",
+          "payment_intent": null,
+          "payment_link": null,
+          "payment_method_collection": "always",
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "request_three_d_secure": "automatic"
+            }
+          },
+          "payment_method_types": [
+            "card"
+          ],
+          "payment_status": "no_payment_required",
+          "phone_number_collection": {
+            "enabled": false
+          },
+          "recovered_from": null,
+          "setup_intent": "seti_1Oq5cHDEQaroqDjs0wjbuunW",
+          "shipping": null,
+          "shipping_address_collection": null,
+          "shipping_options": [],
+          "shipping_rate": null,
+          "status": "expired",
+          "submit_type": null,
+          "subscription": null,
+          "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+          "total_details": null,
+          "ui_mode": "hosted",
+          "url": null
+        }
+      },
+      "id": "evt_1OqSn4DEQaroqDjsZWkbHtxU",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": null
+      },
+      "type": "checkout.session.expired"
+    }
+  ],
+  "has_more": false,
+  "object": "list",
+  "url": "/v1/events"
+}
diff --git a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.5.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.5.json
similarity index 100%
rename from corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.5.json
rename to corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.5.json
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.1.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.1.json
index 30c937cdf4..abfe6539d1 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "100",
     "plan_tier": "1",
     "user_id": "10"
@@ -163,5 +165,5 @@
   "total_excluding_tax": 800000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.2.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.2.json
index c4deffa52a..64a6517706 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -208,5 +210,5 @@
   "total_excluding_tax": 1600000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.3.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.3.json
index 8354b78ece..31fd26786e 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.3.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.3.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 960000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.1.json
index 6fe079e212..dcb0141d8f 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjI10200rTM4WkrR?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjI10200rTM4WkrR/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,12 +111,13 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "100",
     "plan_tier": "1",
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0001",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -163,5 +165,5 @@
   "total_excluding_tax": 800000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.2.json
index 7b72b2976d..e8a7ca9909 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrSU0yQzRLeE1qdWNKZDdZbXpJYXFicXQ1QU9yLDk4MDI4NjI30200GZhwV262?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa1hZcFZtOVFGVnl2VUVPVHdkMVNmYlIxR1hZLDEwMDA2NTk3Nw0200IXiELgD5?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrSU0yQzRLeE1qdWNKZDdZbXpJYXFicXQ1QU9yLDk4MDI4NjI30200GZhwV262/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa1hZcFZtOVFGVnl2VUVPVHdkMVNmYlIxR1hZLDEwMDA2NTk3Nw0200IXiELgD5/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000003",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000003",
         "livemode": false,
         "metadata": {},
@@ -160,7 +162,7 @@
   "livemode": false,
   "metadata": {},
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -208,5 +210,5 @@
   "total_excluding_tax": 1600000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.3.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.3.json
index c979c95558..91d80717df 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.3.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.3.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjMw0200UfxszQfl?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QVWxzNEpLT1NwQnljeUFyUDlZcURoQVQySlU2LDEwMDA2NTk4MA0200MWq67ZiA?s=ap",
   "id": "in_NORMALIZED00000000000003",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjMw0200UfxszQfl/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QVWxzNEpLT1NwQnljeUFyUDlZcURoQVQySlU2LDEwMDA2NTk4MA0200MWq67ZiA/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000004",
+        "invoice": "in_NORMALIZED00000000000003",
         "invoice_item": "ii_NORMALIZED00000000000004",
         "livemode": false,
         "metadata": {},
@@ -110,7 +111,7 @@
   "livemode": false,
   "metadata": {},
   "next_payment_attempt": null,
-  "number": "NORMALI-0003",
+  "number": "NORMALI-0004",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -158,5 +159,5 @@
   "total_excluding_tax": 960000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.1.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.1.json
index 1dda07e3a7..a0c6dc785b 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.1.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.1.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrSU0yQzRLeE1qdWNKZDdZbXpJYXFicXQ1QU9yLDk4MDI4NjI40200RjLJ7u8G?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa1hZcFZtOVFGVnl2VUVPVHdkMVNmYlIxR1hZLDEwMDA2NTk3OA0200S2dY5Zkl?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrSU0yQzRLeE1qdWNKZDdZbXpJYXFicXQ1QU9yLDk4MDI4NjI40200RjLJ7u8G/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa1hZcFZtOVFGVnl2VUVPVHdkMVNmYlIxR1hZLDEwMDA2NTk3OA0200S2dY5Zkl/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -112,6 +113,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -162,7 +164,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": null,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -210,7 +212,7 @@
       "total_excluding_tax": 1600000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -224,7 +226,7 @@
       "application_fee_amount": null,
       "attempt_count": 0,
       "attempted": false,
-      "auto_advance": true,
+      "auto_advance": false,
       "automatic_tax": {
         "enabled": false,
         "liability": null,
@@ -255,9 +257,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjI40200NUsUJjGy?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3OA02002hzqMFVo?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjI40200NUsUJjGy/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3OA02002hzqMFVo/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -274,6 +276,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -324,17 +327,18 @@
       "livemode": false,
       "metadata": {
         "billing_schedule": "1",
+        "license_management": "manual",
         "licenses": "100",
         "plan_tier": "1",
         "user_id": "10"
       },
       "next_payment_attempt": null,
-      "number": "NORMALI-0001",
+      "number": "NORMALI-0002",
       "object": "invoice",
       "on_behalf_of": null,
-      "paid": false,
-      "paid_out_of_band": false,
-      "payment_intent": "pi_NORMALIZED00000000000001",
+      "paid": true,
+      "paid_out_of_band": true,
+      "payment_intent": null,
       "payment_settings": {
         "default_mandate": null,
         "payment_method_options": null,
@@ -357,11 +361,11 @@
       "shipping_details": null,
       "starting_balance": 0,
       "statement_descriptor": "Zulip Cloud Standard",
-      "status": "open",
+      "status": "paid",
       "status_transitions": {
         "finalized_at": 1000000000,
         "marked_uncollectible_at": null,
-        "paid_at": null,
+        "paid_at": 1000000000,
         "voided_at": null
       },
       "subscription": null,
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.2.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.2.json
index ffef0758b8..a7f15a72e8 100644
--- a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjMx0200yK6yF06t?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QVWxzNEpLT1NwQnljeUFyUDlZcURoQVQySlU2LDEwMDA2NTk4MA0200MWq67ZiA?s=ap",
       "id": "in_NORMALIZED00000000000003",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjMx0200yK6yF06t/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QVWxzNEpLT1NwQnljeUFyUDlZcURoQVQySlU2LDEwMDA2NTk4MA0200MWq67ZiA/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000004",
+            "invoice": "in_NORMALIZED00000000000003",
             "invoice_item": "ii_NORMALIZED00000000000004",
             "livemode": false,
             "metadata": {},
@@ -112,7 +113,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": null,
-      "number": "NORMALI-0003",
+      "number": "NORMALI-0004",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -160,7 +161,7 @@
       "total_excluding_tax": 960000,
       "total_tax_amounts": [],
       "transfer_data": null,
-      "webhooks_delivered_at": null
+      "webhooks_delivered_at": 1000000000
     },
     {
       "account_country": "US",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrSU0yQzRLeE1qdWNKZDdZbXpJYXFicXQ1QU9yLDk4MDI4NjMx0200pllsRuA2?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa1hZcFZtOVFGVnl2VUVPVHdkMVNmYlIxR1hZLDEwMDA2NTk4MA0200GydVuqNB?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrSU0yQzRLeE1qdWNKZDdZbXpJYXFicXQ1QU9yLDk4MDI4NjMx0200pllsRuA2/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa1hZcFZtOVFGVnl2VUVPVHdkMVNmYlIxR1hZLDEwMDA2NTk4MA0200GydVuqNB/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -224,6 +225,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -274,6 +276,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000003",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000003",
             "livemode": false,
             "metadata": {},
@@ -324,7 +327,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": null,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
@@ -386,7 +389,7 @@
       "application_fee_amount": null,
       "attempt_count": 0,
       "attempted": false,
-      "auto_advance": true,
+      "auto_advance": false,
       "automatic_tax": {
         "enabled": false,
         "liability": null,
@@ -417,9 +420,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjMx0200LIsSUK7M?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk4MA02005gAh2bRu?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjMx0200LIsSUK7M/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk4MA02005gAh2bRu/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -436,6 +439,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -486,17 +490,18 @@
       "livemode": false,
       "metadata": {
         "billing_schedule": "1",
+        "license_management": "manual",
         "licenses": "100",
         "plan_tier": "1",
         "user_id": "10"
       },
       "next_payment_attempt": null,
-      "number": "NORMALI-0001",
+      "number": "NORMALI-0002",
       "object": "invoice",
       "on_behalf_of": null,
-      "paid": false,
-      "paid_out_of_band": false,
-      "payment_intent": "pi_NORMALIZED00000000000001",
+      "paid": true,
+      "paid_out_of_band": true,
+      "payment_intent": null,
       "payment_settings": {
         "default_mandate": null,
         "payment_method_options": null,
@@ -519,11 +524,11 @@
       "shipping_details": null,
       "starting_balance": 0,
       "statement_descriptor": "Zulip Cloud Standard",
-      "status": "open",
+      "status": "paid",
       "status_transitions": {
         "finalized_at": 1000000000,
         "marked_uncollectible_at": null,
-        "paid_at": null,
+        "paid_at": 1000000000,
         "voided_at": null
       },
       "subscription": null,
diff --git a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.pay.1.json
new file mode 100644
index 0000000000..d53a5b44c2
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.pay.1.json
@@ -0,0 +1,169 @@
+{
+  "account_country": "US",
+  "account_name": "Kandra Labs, Inc.",
+  "account_tax_ids": null,
+  "amount_due": 800000,
+  "amount_paid": 0,
+  "amount_remaining": 800000,
+  "amount_shipping": 0,
+  "application": null,
+  "application_fee_amount": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "auto_advance": false,
+  "automatic_tax": {
+    "enabled": false,
+    "liability": null,
+    "status": null
+  },
+  "billing_reason": "manual",
+  "charge": null,
+  "collection_method": "send_invoice",
+  "created": 1000000000,
+  "currency": "usd",
+  "custom_fields": null,
+  "customer": "cus_NORMALIZED0001",
+  "customer_address": null,
+  "customer_email": "hamlet@zulip.com",
+  "customer_name": null,
+  "customer_phone": null,
+  "customer_shipping": null,
+  "customer_tax_exempt": "none",
+  "customer_tax_ids": [],
+  "default_payment_method": null,
+  "default_source": null,
+  "default_tax_rates": [],
+  "description": null,
+  "discount": null,
+  "discounts": [],
+  "due_date": 1000000000,
+  "effective_at": 1000000000,
+  "ending_balance": 0,
+  "footer": null,
+  "from_invoice": null,
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Qa3ZqdmVYNnI5WjVVTGNjQzlmZXIybU5XSFVyLDEwMDA2NTk3Mw0200IIKf6He0/pdf?s=ap",
+  "issuer": {
+    "type": "self"
+  },
+  "last_finalization_error": null,
+  "latest_revision": null,
+  "lines": {
+    "data": [
+      {
+        "amount": 800000,
+        "amount_excluding_tax": 800000,
+        "currency": "usd",
+        "description": "Zulip Cloud Standard",
+        "discount_amounts": [],
+        "discountable": false,
+        "discounts": [],
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1000000000,
+          "start": 1000000000
+        },
+        "plan": null,
+        "price": {
+          "active": false,
+          "billing_scheme": "per_unit",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_unit_amount": null,
+          "id": "price_NORMALIZED00000000000001",
+          "livemode": false,
+          "lookup_key": null,
+          "metadata": {},
+          "nickname": null,
+          "object": "price",
+          "product": "prod_NORMALIZED0001",
+          "recurring": null,
+          "tax_behavior": "unspecified",
+          "tiers_mode": null,
+          "transform_quantity": null,
+          "type": "one_time",
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        },
+        "proration": false,
+        "proration_details": {
+          "credited_items": null
+        },
+        "quantity": 100,
+        "subscription": null,
+        "tax_amounts": [],
+        "tax_rates": [],
+        "type": "invoiceitem",
+        "unit_amount_excluding_tax": "8000"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+  },
+  "livemode": false,
+  "metadata": {
+    "billing_schedule": "1",
+    "license_management": "manual",
+    "licenses": "100",
+    "plan_tier": "1",
+    "user_id": "10"
+  },
+  "next_payment_attempt": null,
+  "number": "NORMALI-0002",
+  "object": "invoice",
+  "on_behalf_of": null,
+  "paid": true,
+  "paid_out_of_band": true,
+  "payment_intent": null,
+  "payment_settings": {
+    "default_mandate": null,
+    "payment_method_options": null,
+    "payment_method_types": null
+  },
+  "period_end": 1000000000,
+  "period_start": 1000000000,
+  "post_payment_credit_notes_amount": 0,
+  "pre_payment_credit_notes_amount": 0,
+  "quote": null,
+  "receipt_number": null,
+  "rendering": {
+    "amount_tax_display": null,
+    "pdf": {
+      "page_size": "letter"
+    }
+  },
+  "rendering_options": null,
+  "shipping_cost": null,
+  "shipping_details": null,
+  "starting_balance": 0,
+  "statement_descriptor": "Zulip Cloud Standard",
+  "status": "paid",
+  "status_transitions": {
+    "finalized_at": 1000000000,
+    "marked_uncollectible_at": null,
+    "paid_at": 1000000000,
+    "voided_at": null
+  },
+  "subscription": null,
+  "subscription_details": {
+    "metadata": null
+  },
+  "subtotal": 800000,
+  "subtotal_excluding_tax": 800000,
+  "tax": null,
+  "test_clock": null,
+  "total": 800000,
+  "total_discount_amounts": [],
+  "total_excluding_tax": 800000,
+  "total_tax_amounts": [],
+  "transfer_data": null,
+  "webhooks_delivered_at": 1000000000
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Charge.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Charge.list.1.json
index df9c7e0bbd..483485f6e8 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Charge.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Charge.list.1.json
@@ -51,7 +51,7 @@
       },
       "paid": true,
       "payment_intent": "pi_NORMALIZED00000000000001",
-      "payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+      "payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
       "payment_method_details": {
         "card": {
           "amount_authorized": 48000,
@@ -62,7 +62,7 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "exp_month": 3,
           "exp_year": 2025,
           "extended_authorization": {
             "status": "disabled"
@@ -94,7 +94,7 @@
       "radar_options": {},
       "receipt_email": "hamlet@zulip.com",
       "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOTkmK4GMgaQx0rXimM6LBZj2DEPdwClSseryeZ5eOc9VpA2FQ-AHsNMjAPpa_F5VjoK101ntx9qXyW8?s=ap",
+      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMmRla8GMgY-jJ1I0b86LBapbjKNDTwqjpj0RZJqvPPwr82gYGH8hGCZCHqSYwtvTDLHtRImOIdRC46h?s=ap",
       "refunded": false,
       "refunds": {
         "data": [],
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.modify.1.json
index 111ce6076b..96d5fc9c55 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+    "default_payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json
index accc1add5e..90578bd434 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+      "id": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.3.json
index accc1add5e..90578bd434 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+      "id": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.4.json
index accc1add5e..90578bd434 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+      "id": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.5.json
index accc1add5e..90578bd434 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+      "id": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.6.json
index 2115a5796e..c8acc5c682 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+      "id": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.1.json
index 6b7057b4c6..4e30bdb774 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.1.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjMw0200UfxszQfl?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QVWxzNEpLT1NwQnljeUFyUDlZcURoQVQySlU2LDEwMDA2NTk4MA0200MWq67ZiA?s=ap",
           "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjMw0200UfxszQfl/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9QVWxzNEpLT1NwQnljeUFyUDlZcURoQVQySlU2LDEwMDA2NTk4MA0200MWq67ZiA/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000002",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -164,16 +165,16 @@
           "total_excluding_tax": 960000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhumgDEQaroqDjsDcclWoC5",
+      "id": "evt_1OqSnADEQaroqDjshpg28yE4",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "0651699c-3851-4e9d-b8d5-297e38b573db"
+        "idempotency_key": "80619383-8520-4d01-8ec9-b83268266cf7"
       },
       "type": "invoice.finalized"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.2.json
index c2cd5e5181..6dfe31a3a7 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.2.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+            "default_payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhumnDEQaroqDjsXuzKqxBX",
+      "id": "evt_1OqSnGDEQaroqDjs3kQOZdv4",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "c06a482d-c876-4c40-a680-505ff68789ff"
+        "idempotency_key": "e2f9de20-7c2f-4c5d-b85e-745bba765ce9"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.3.json
index dacc6ca5a7..4f5c4e2719 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.3.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+                "payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOLkmK4GMgbhW249eRU6LBY-rJ6tNur3SK-OrsO3PSnxKTms8YrFqHc4SjDtIBXGOGR_92FgGeLecd9T?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMiRla8GMgZ03BprTX06LBaK-vXBuirjkbLUFPmRtEnp3Rqa_K7j54oqdqgigyI9fFEdhZSUmC2RUVDu?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_qAclAyngiUxgTp9ro0Z6l3u3z",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_vEB8EXXiRRTTaP3MLp4MBMgXc",
           "confirmation_method": "automatic",
           "created": 1010000008,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+          "payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,19 +181,147 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhumqDEQaroqDjs1GHxTCV7",
+      "id": "evt_3OqSnJDEQaroqDjs1zWRNloj",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "408c1c75-2ec6-4bd2-9b9c-d8c45bf2f715"
+        "idempotency_key": "ed889de7-97b5-4cc5-9a16-e342732d9d8b"
       },
       "type": "payment_intent.succeeded"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000008,
+      "created": 1010000001,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1010000001,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMiRla8GMgYqX1XwUKc6LBbc__zOvAevvHJBNpCfnVnyMYkfBokNBdD4Fp1hXMAOOlZ7eCNOv1SjbeLo?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSnJDEQaroqDjs1e5qdOIP",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "ed889de7-97b5-4cc5-9a16-e342732d9d8b"
+      },
+      "type": "charge.succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000009,
       "data": {
         "object": {
           "account_country": "US",
@@ -216,7 +344,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000009,
+          "created": 1010000008,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQx0200x2xim4yG?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MA0200hMfQYMAH?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQx0200x2xim4yG/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MA0200hMfQYMAH/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -361,22 +490,22 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhumrDEQaroqDjsQ2ztAEmn",
+      "id": "evt_1OqSnKDEQaroqDjsjSJ30zyR",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "0ed4a643-e268-45d4-8568-4752b240e8eb"
+        "idempotency_key": "a3644fdc-1e4d-422b-a693-5321ed594ceb"
       },
       "type": "invoice.finalized"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000008,
+      "created": 1010000009,
       "data": {
         "object": {
           "account_country": "US",
@@ -399,7 +528,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000009,
+          "created": 1010000008,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -421,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQx0200x2xim4yG?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MA0200hMfQYMAH?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQx0200x2xim4yG/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MA0200hMfQYMAH/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -440,6 +569,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -544,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -564,19 +694,19 @@
           }
         }
       },
-      "id": "evt_1OhumrDEQaroqDjsozashkR0",
+      "id": "evt_1OqSnKDEQaroqDjsd9azmy7p",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "0ed4a643-e268-45d4-8568-4752b240e8eb"
+        "idempotency_key": "a3644fdc-1e4d-422b-a693-5321ed594ceb"
       },
       "type": "invoice.updated"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000008,
+      "created": 1010000009,
       "data": {
         "object": {
           "amount": 48000,
@@ -598,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_qAclAyngiUxgTp9ro0Z6l3u3z",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_vEB8EXXiRRTTaP3MLp4MBMgXc",
           "confirmation_method": "automatic",
           "created": 1010000008,
           "currency": "usd",
@@ -641,19 +771,19 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhumqDEQaroqDjs13d7oWWN",
+      "id": "evt_3OqSnJDEQaroqDjs1PhobBzp",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "0ed4a643-e268-45d4-8568-4752b240e8eb"
+        "idempotency_key": "a3644fdc-1e4d-422b-a693-5321ed594ceb"
       },
       "type": "payment_intent.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000009,
+      "created": 1010000008,
       "data": {
         "object": {
           "account_country": "US",
@@ -676,7 +806,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000009,
+          "created": 1010000008,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -717,6 +847,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -821,22 +952,22 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhumqDEQaroqDjsqeMZTWhJ",
+      "id": "evt_1OqSnJDEQaroqDjsPeXpZjiU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "c5674f23-0410-462e-9d14-6d8e0b189aed"
+        "idempotency_key": "cd649fc7-357e-44b7-a506-69b862716e6d"
       },
       "type": "invoice.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000009,
+      "created": 1010000011,
       "data": {
         "object": {
           "amount": 48000,
@@ -886,19 +1017,19 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhumpDEQaroqDjsvewYGB2r",
+      "id": "evt_1OqSnJDEQaroqDjsLp9rwIYi",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "ab983467-293b-40b5-9303-3e4e91d2a705"
+        "idempotency_key": "ca431a83-ef26-4b42-b4e8-9f3795336889"
       },
       "type": "invoiceitem.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000009,
+      "created": 1010000011,
       "data": {
         "object": {
           "address": null,
@@ -915,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+            "default_payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
             "footer": null,
             "rendering_options": null
           },
@@ -938,13 +1069,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhumpDEQaroqDjsTE6b16U4",
+      "id": "evt_1OqSnJDEQaroqDjssK0zw1Cy",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "ab983467-293b-40b5-9303-3e4e91d2a705"
+        "idempotency_key": "ca431a83-ef26-4b42-b4e8-9f3795336889"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.4.json
index c158d8a751..d24cf7ec17 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.4.json
@@ -25,7 +25,7 @@
           "billing_reason": "manual",
           "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1010000009,
+          "created": 1010000008,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQz020060ocl5aP?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mg0200tGmhNc0B?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQz020060ocl5aP/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mg0200tGmhNc0B/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -173,13 +174,197 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhumtDEQaroqDjsDBfGcH0n",
+      "id": "evt_1OqSnMDEQaroqDjsQt1fWyVR",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "408c1c75-2ec6-4bd2-9b9c-d8c45bf2f715"
+        "idempotency_key": "ed889de7-97b5-4cc5-9a16-e342732d9d8b"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000001,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1010000008,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mg0200tGmhNc0B?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mg0200tGmhNc0B/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000010,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0003",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSnMDEQaroqDjsks26khSi",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "ed889de7-97b5-4cc5-9a16-e342732d9d8b"
       },
       "type": "invoice.paid"
     },
@@ -208,7 +393,7 @@
           "billing_reason": "manual",
           "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1010000009,
+          "created": 1010000008,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -230,9 +415,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQz020060ocl5aP?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mg0200tGmhNc0B?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQz020060ocl5aP/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mg0200tGmhNc0B/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -249,6 +434,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -368,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1OhumtDEQaroqDjsIqaucH6N",
+      "id": "evt_1OqSnMDEQaroqDjsIYgd9Box",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "408c1c75-2ec6-4bd2-9b9c-d8c45bf2f715"
+        "idempotency_key": "ed889de7-97b5-4cc5-9a16-e342732d9d8b"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.5.json
index 89d100070c..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.5.json
@@ -1,189 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1010000001,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1010000009,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQz020060ocl5aP?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQz020060ocl5aP/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1010000010,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0003",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhumtDEQaroqDjs1xc9K7Nd",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "408c1c75-2ec6-4bd2-9b9c-d8c45bf2f715"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.6.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.6.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.6.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.create.1.json
index 5f3fb65945..fb8ade5770 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.create.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000009,
+  "created": 1010000008,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.finalize_invoice.1.json
index 7537179963..ac07016c3e 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.finalize_invoice.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000009,
+  "created": 1010000008,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQw0200zmM3ixIR?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MA0200hMfQYMAH?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQw0200zmM3ixIR/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MA0200hMfQYMAH/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.list.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.list.2.json
index 290e8f6922..22a8d955c4 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.list.2.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": "ch_NORMALIZED00000000000001",
       "collection_method": "charge_automatically",
-      "created": 1010000009,
+      "created": 1010000008,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQ102006kYIVOUF?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mw0200THUzV66N?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQ102006kYIVOUF/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5Mw0200THUzV66N/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.pay.1.json
index 8956e41ecb..c30d61fe72 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.pay.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": "ch_NORMALIZED00000000000001",
   "collection_method": "charge_automatically",
-  "created": 1010000009,
+  "created": 1010000008,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQy02005Kl0Bn0c?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MQ02004xSmPBBA?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrUWdVczVuV1lNcjNaMmpmeGNsU1l4U2k0d3hJLDk4MDI4NjQy02005Kl0Bn0c/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9Ra0E4amgyT0pCZmg2ZmNLYjFCc2I5dENmcGliLDEwMDA2NTk5MQ02004xSmPBBA/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.create.1.json
index b96a61a4a4..30672ba9b1 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumlDEQaroqDjsczsXAdof_secret_PWykAXEn6vIOFLXysemOAy7kUBTXB6I",
+  "client_secret": "seti_1OqSnFDEQaroqDjsg1EeRyfW_secret_PfoQggAkPb2n8x1mIMrZ9diUZwDzdnO",
   "created": 1010000003,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumlDEQaroqDjsczsXAdof",
+  "id": "seti_1OqSnFDEQaroqDjsg1EeRyfW",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumlDEQaroqDjsmVycORgY",
+  "latest_attempt": "setatt_1OqSnFDEQaroqDjs2B08ERS8",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+  "payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.list.1.json
index 4444072284..e8a95b5e04 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhumkDEQaroqDjsdjRPZgWf_secret_PWykeWLn9xdgAQQSdwdUrq7iUlBzSlZ",
-      "created": 1010000011,
+      "client_secret": "seti_1OqSnEDEQaroqDjsF5oyLk1Z_secret_PfoQlj6vyI3HQwEJsq5chv33r4H6Da3",
+      "created": 1010000012,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhumkDEQaroqDjsdjRPZgWf",
+      "id": "seti_1OqSnEDEQaroqDjsF5oyLk1Z",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.retrieve.1.json
index b96a61a4a4..30672ba9b1 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumlDEQaroqDjsczsXAdof_secret_PWykAXEn6vIOFLXysemOAy7kUBTXB6I",
+  "client_secret": "seti_1OqSnFDEQaroqDjsg1EeRyfW_secret_PfoQggAkPb2n8x1mIMrZ9diUZwDzdnO",
   "created": 1010000003,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumlDEQaroqDjsczsXAdof",
+  "id": "seti_1OqSnFDEQaroqDjsg1EeRyfW",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumlDEQaroqDjsmVycORgY",
+  "latest_attempt": "setatt_1OqSnFDEQaroqDjs2B08ERS8",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumlDEQaroqDjsUUiVtdc7",
+  "payment_method": "pm_1OqSnEDEQaroqDjsEQmK8UNZ",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.create.1.json
index 2b885164e4..a532314f22 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000011,
+  "created": 1010000012,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02HToDnFNEmmi3MTIH8zb08GlZLLCzI8n2G1lEtV3T3HMKQe",
+  "id": "cs_test_NORMALIZED025iXbhh1zeQTV1VntFlZybXS8qGTDqR5BGITm5uRS03khKA",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhumkDEQaroqDjsdjRPZgWf",
+  "setup_intent": "seti_1OqSnEDEQaroqDjsF5oyLk1Z",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02HToDnFNEmmi3MTIH8zb08GlZLLCzI8n2G1lEtV3T3HMKQe#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED025iXbhh1zeQTV1VntFlZybXS8qGTDqR5BGITm5uRS03khKA#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.list.1.json
index 7b3864352f..150a47b63c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000011,
+      "created": 1010000012,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02HToDnFNEmmi3MTIH8zb08GlZLLCzI8n2G1lEtV3T3HMKQe",
+      "id": "cs_test_NORMALIZED025iXbhh1zeQTV1VntFlZybXS8qGTDqR5BGITm5uRS03khKA",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhumkDEQaroqDjsdjRPZgWf",
+      "setup_intent": "seti_1OqSnEDEQaroqDjsF5oyLk1Z",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02HToDnFNEmmi3MTIH8zb08GlZLLCzI8n2G1lEtV3T3HMKQe#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED025iXbhh1zeQTV1VntFlZybXS8qGTDqR5BGITm5uRS03khKA#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Charge.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Charge.list.1.json
index 6002ffb9c9..3f678d477c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Charge.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Charge.list.1.json
@@ -51,7 +51,7 @@
       },
       "paid": true,
       "payment_intent": "pi_NORMALIZED00000000000001",
-      "payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+      "payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
       "payment_method_details": {
         "card": {
           "amount_authorized": 48000,
@@ -62,7 +62,7 @@
             "cvc_check": "pass"
           },
           "country": "US",
-          "exp_month": 2,
+          "exp_month": 3,
           "exp_year": 2025,
           "extended_authorization": {
             "status": "disabled"
@@ -94,7 +94,7 @@
       "radar_options": {},
       "receipt_email": "hamlet@zulip.com",
       "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKPLkmK4GMgZUX7RABzk6LBYminXhdsR3MgLPwpbkAg4Yst15ZnWiNGQxkxtSvuTGBfnJ0osHoPbLuuyP?s=ap",
+      "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNaRla8GMgbsseK1-k86LBYujm0K46oVPulUddke1x2HhWXSmPamqjujnzqZgZQXO4CNnS-SVy-oXqFu?s=ap",
       "refunded": false,
       "refunds": {
         "data": [],
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.modify.1.json
index 9ac82718eb..c8a7885bab 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+    "default_payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.1.json
index d0a69e96b7..767921c4f8 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+      "id": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.2.json
index d0a69e96b7..767921c4f8 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+      "id": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.1.json
index 8fa1174ba6..14df1b7724 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+            "default_payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhumzDEQaroqDjs8iywORPo",
+      "id": "evt_1OqSnSDEQaroqDjsucQM56XB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "ccdca9b0-0577-4610-a54b-abf0a661e8f1"
+        "idempotency_key": "dab16d04-023f-4c59-86ab-941af0b0c9c9"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.2.json
index 4f1b19dab3..64083835d7 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+                "payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 48000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKO7kmK4GMgbjOA5xjZs6LBZsW89pPvGILenrA4VFlfn0scIEe3VeNuhA6RI33GRWCUCsyDUCM4WzFuYj?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNKRla8GMgYf3np70z86LBas-2aCqz_AT23-41PWvaKHkvb6E4NHH_sfGXkurbOyhJkC1PXGFo2k2hM0?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_prxWyhVPYGmOKYcKpnt0VMo1X",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_a2nILswSG7LFZIRKGf922Koro",
           "confirmation_method": "automatic",
           "created": 1010000006,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+          "payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,192 +181,143 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohun1DEQaroqDjs0ahq9Tpx",
+      "id": "evt_3OqSnUDEQaroqDjs1E1iOecJ",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff10ab13-b318-4fd7-9daf-1a1dab620bb3"
+        "idempotency_key": "22bf0941-fd07-4395-85ab-57fc66e91e16"
       },
       "type": "payment_intent.succeeded"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000007,
+      "created": 1010000005,
       "data": {
         "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 960000,
-          "amount_paid": 0,
-          "amount_remaining": 960000,
-          "amount_shipping": 0,
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
           "application": null,
+          "application_fee": null,
           "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": true,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
           },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "send_invoice",
-          "created": 1010000008,
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1010000001,
           "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0002",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": 1000000000,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjUy020051M0b9FR?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrbllJUVF1cE5aZHM4aDRzQUNXQkh6VE0zbHJYLDk4MDI4NjUy020051M0b9FR/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 960000,
-                "amount_excluding_tax": 960000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard - renewal",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1420167845,
-                  "start": 1388631845
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1010000009,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 120,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
           "livemode": false,
           "metadata": {},
-          "next_payment_attempt": null,
-          "number": "NORMALI-0001",
-          "object": "invoice",
+          "object": "charge",
           "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
           },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKNKRla8GMgZUqXLj20w6LBb3qIzBfDknRPA_M1JkFqxo8n1-YklORMuZMYp2rxv2AbBMAy9Jd-uj6mtX?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
           },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
           "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 960000,
-          "subtotal_excluding_tax": 960000,
-          "tax": null,
-          "test_clock": null,
-          "total": 960000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 960000,
-          "total_tax_amounts": [],
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
           "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
+          "transfer_group": null
         }
       },
-      "id": "evt_1Ohun2DEQaroqDjsXGXthKoQ",
+      "id": "evt_3OqSnUDEQaroqDjs18LKL4bC",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": null,
-        "idempotency_key": null
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "22bf0941-fd07-4395-85ab-57fc66e91e16"
       },
-      "type": "invoice.sent"
+      "type": "charge.succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -393,7 +344,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000006,
+          "created": 1010000007,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -415,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjUy02006BvMEFFP?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMQ02008oiMGvO7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjUy02006BvMEFFP/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMQ02008oiMGvO7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -433,8 +384,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -446,16 +398,16 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000010,
+                  "created": 1010000008,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -490,7 +442,7 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0002",
+          "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
@@ -538,16 +490,16 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohun2DEQaroqDjsuk9g9XPf",
+      "id": "evt_1OqSnVDEQaroqDjsaEW9LEwX",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "2ba315d9-fca8-496b-9526-8c47f68f69b4"
+        "idempotency_key": "59c6d075-b402-41b2-8b1b-5c551d8124ec"
       },
       "type": "invoice.finalized"
     },
@@ -576,7 +528,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000006,
+          "created": 1010000007,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -598,9 +550,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjUy02006BvMEFFP?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMQ02008oiMGvO7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjUy02006BvMEFFP/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMQ02008oiMGvO7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -616,8 +568,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -629,16 +582,16 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000010,
+                  "created": 1010000008,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -673,7 +626,7 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0002",
+          "number": "NORMALI-0001",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
@@ -721,7 +674,7 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -741,13 +694,13 @@
           }
         }
       },
-      "id": "evt_1Ohun2DEQaroqDjs9tWS6YPr",
+      "id": "evt_1OqSnVDEQaroqDjsBFKvP133",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "2ba315d9-fca8-496b-9526-8c47f68f69b4"
+        "idempotency_key": "59c6d075-b402-41b2-8b1b-5c551d8124ec"
       },
       "type": "invoice.updated"
     },
@@ -775,7 +728,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_prxWyhVPYGmOKYcKpnt0VMo1X",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_a2nILswSG7LFZIRKGf922Koro",
           "confirmation_method": "automatic",
           "created": 1010000006,
           "currency": "usd",
@@ -818,13 +771,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohun1DEQaroqDjs0cVQmoJU",
+      "id": "evt_3OqSnUDEQaroqDjs1Y28b57q",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "2ba315d9-fca8-496b-9526-8c47f68f69b4"
+        "idempotency_key": "59c6d075-b402-41b2-8b1b-5c551d8124ec"
       },
       "type": "payment_intent.created"
     },
@@ -853,7 +806,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000006,
+          "created": 1010000007,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -893,8 +846,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -906,16 +860,16 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000010,
+                  "created": 1010000008,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -998,22 +952,22 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohun1DEQaroqDjsCuI3ktv5",
+      "id": "evt_1OqSnUDEQaroqDjsVgSTsKGB",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "32d1b529-78ed-461a-84b4-9afcb2217a0e"
+        "idempotency_key": "3b8ab016-5557-4090-ad73-5a50099df5d1"
       },
       "type": "invoice.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000011,
+      "created": 1010000007,
       "data": {
         "object": {
           "amount": 48000,
@@ -1023,7 +977,7 @@
           "description": "Zulip Cloud Standard",
           "discountable": false,
           "discounts": [],
-          "id": "ii_NORMALIZED00000000000002",
+          "id": "ii_NORMALIZED00000000000001",
           "invoice": null,
           "livemode": false,
           "metadata": {},
@@ -1036,16 +990,16 @@
           "price": {
             "active": false,
             "billing_scheme": "per_unit",
-            "created": 1010000010,
+            "created": 1010000008,
             "currency": "usd",
             "custom_unit_amount": null,
-            "id": "price_NORMALIZED00000000000002",
+            "id": "price_NORMALIZED00000000000001",
             "livemode": false,
             "lookup_key": null,
             "metadata": {},
             "nickname": null,
             "object": "price",
-            "product": "prod_NORMALIZED0002",
+            "product": "prod_NORMALIZED0001",
             "recurring": null,
             "tax_behavior": "unspecified",
             "tiers_mode": null,
@@ -1063,19 +1017,19 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1Ohun0DEQaroqDjsHTvDt7Mo",
+      "id": "evt_1OqSnTDEQaroqDjsYZj0qq3w",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "15c6554a-0cfd-479a-9f86-03e5f0a74120"
+        "idempotency_key": "9168e70b-9baa-4863-b66a-4059d82c83c3"
       },
       "type": "invoiceitem.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000011,
+      "created": 1010000007,
       "data": {
         "object": {
           "address": null,
@@ -1092,7 +1046,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+            "default_payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
             "footer": null,
             "rendering_options": null
           },
@@ -1115,197 +1069,15 @@
           "default_currency": null
         }
       },
-      "id": "evt_1Ohun0DEQaroqDjs6SKmiHq8",
+      "id": "evt_1OqSnTDEQaroqDjsTE2as6cz",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "15c6554a-0cfd-479a-9f86-03e5f0a74120"
+        "idempotency_key": "9168e70b-9baa-4863-b66a-4059d82c83c3"
       },
       "type": "customer.updated"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1010000011,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 800000,
-          "amount_paid": 0,
-          "amount_remaining": 800000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": true,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "send_invoice",
-          "created": 1010000012,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0002",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": 1000000000,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjUw0200Hc9CRCt3?s=ap",
-          "id": "in_NORMALIZED00000000000003",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVjRqSUFWVXBLVjlEQ0R5Y3NkZXlaTE10NllILDk4MDI4NjUw0200Hc9CRCt3/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 800000,
-                "amount_excluding_tax": 800000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000003",
-                "invoice_item": "ii_NORMALIZED00000000000003",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1010000010,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 100,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000003/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "licenses": "100",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0003",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000003",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 800000,
-          "subtotal_excluding_tax": 800000,
-          "tax": null,
-          "test_clock": null,
-          "total": 800000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 800000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1Ohun0DEQaroqDjs6B4Nv1w7",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": null,
-        "idempotency_key": null
-      },
-      "type": "invoice.sent"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.3.json
index fdef7b05b0..a618e9e5df 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.3.json
@@ -25,7 +25,7 @@
           "billing_reason": "manual",
           "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1010000006,
+          "created": 1010000007,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU102009Aa5Xzi1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMw0200F7bBPUxX?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU102009Aa5Xzi1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMw0200F7bBPUxX/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -65,8 +65,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -78,16 +79,16 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000010,
+                  "created": 1010000008,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -122,7 +123,7 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0004",
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
@@ -173,15 +174,15 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohun5DEQaroqDjsbJIUFGjI",
+      "id": "evt_1OqSnXDEQaroqDjsRkvKjf80",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff10ab13-b318-4fd7-9daf-1a1dab620bb3"
+        "idempotency_key": "22bf0941-fd07-4395-85ab-57fc66e91e16"
       },
-      "type": "invoice.paid"
+      "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -208,7 +209,7 @@
           "billing_reason": "manual",
           "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
-          "created": 1010000006,
+          "created": 1010000007,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -230,9 +231,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU102009Aa5Xzi1?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMw0200F7bBPUxX?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU102009Aa5Xzi1/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMw0200F7bBPUxX/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -248,8 +249,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -261,16 +263,16 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000010,
+                  "created": 1010000008,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
+                  "id": "price_NORMALIZED00000000000001",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0002",
+                  "product": "prod_NORMALIZED0001",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -305,7 +307,191 @@
             "user_id": "10"
           },
           "next_payment_attempt": null,
-          "number": "NORMALI-0004",
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSnXDEQaroqDjsLUtrepbY",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "22bf0941-fd07-4395-85ab-57fc66e91e16"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000005,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1010000007,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMg0200jkv4fuMA?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMg0200jkv4fuMA/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000008,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": true,
@@ -368,13 +554,13 @@
           }
         }
       },
-      "id": "evt_1Ohun5DEQaroqDjsPTCGBEf7",
+      "id": "evt_1OqSnXDEQaroqDjsgftEg5Pl",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff10ab13-b318-4fd7-9daf-1a1dab620bb3"
+        "idempotency_key": "22bf0941-fd07-4395-85ab-57fc66e91e16"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.4.json
index 84b8f5a733..003c585fe5 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.4.json
@@ -2,7 +2,7 @@
   "data": [
     {
       "api_version": "2020-08-27",
-      "created": 1010000013,
+      "created": 1010000009,
       "data": {
         "object": {
           "account_country": "US",
@@ -25,7 +25,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000014,
+          "created": 1010000010,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN?s=ap",
-          "id": "in_NORMALIZED00000000000004",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -65,8 +65,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000004",
-                "invoice_item": "ii_NORMALIZED00000000000004",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -78,16 +79,16 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000015,
+                  "created": 1010000011,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000003",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0003",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -111,17 +112,195 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
           },
           "livemode": false,
           "metadata": {},
           "next_payment_attempt": 1000000000,
-          "number": "NORMALI-0005",
+          "number": "NORMALI-0003",
           "object": "invoice",
           "on_behalf_of": null,
           "paid": false,
           "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000004",
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 136000,
+          "subtotal_excluding_tax": 136000,
+          "tax": null,
+          "test_clock": null,
+          "total": 136000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 136000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSnZDEQaroqDjswSuiSkNJ",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0006",
+        "idempotency_key": "934451b6-f9f5-4f63-9e22-b128999f3d1c"
+      },
+      "type": "invoice.finalized"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000009,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 136000,
+          "amount_paid": 0,
+          "amount_remaining": 136000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "charge_automatically",
+          "created": 1010000010,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 136000,
+                "amount_excluding_tax": 136000,
+                "currency": "usd",
+                "description": "Additional license (Jan 2, 2012 - Jan 2, 2013)",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1357095845,
+                  "start": 1325473445
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000011,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 17,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {},
+          "next_payment_attempt": 1000000000,
+          "number": "NORMALI-0003",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -184,19 +363,19 @@
           }
         }
       },
-      "id": "evt_1Ohun7DEQaroqDjsv9f2sQ7b",
+      "id": "evt_1OqSnZDEQaroqDjs3GY2mTPN",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "8d5a00f1-3837-4959-8140-1f273f309091"
+        "idempotency_key": "934451b6-f9f5-4f63-9e22-b128999f3d1c"
       },
       "type": "invoice.updated"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000013,
+      "created": 1010000010,
       "data": {
         "object": {
           "amount": 136000,
@@ -216,16 +395,16 @@
             "has_more": false,
             "object": "list",
             "total_count": 0,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000004"
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
           },
-          "client_secret": "pi_NORMALIZED00000000000004_secret_CzeyZvTFcpULfu6mtUwpCsap1",
+          "client_secret": "pi_NORMALIZED00000000000002_secret_dDvJNaqxMcxFEManOVFiJb5LJ",
           "confirmation_method": "automatic",
-          "created": 1010000013,
+          "created": 1010000010,
           "currency": "usd",
           "customer": "cus_NORMALIZED0001",
           "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000004",
-          "invoice": "in_NORMALIZED00000000000004",
+          "id": "pi_NORMALIZED00000000000002",
+          "invoice": "in_NORMALIZED00000000000002",
           "last_payment_error": null,
           "latest_charge": null,
           "livemode": false,
@@ -261,19 +440,19 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohun7DEQaroqDjs0mskiTRw",
+      "id": "evt_3OqSnYDEQaroqDjs1r8Naze5",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "8d5a00f1-3837-4959-8140-1f273f309091"
+        "idempotency_key": "934451b6-f9f5-4f63-9e22-b128999f3d1c"
       },
       "type": "payment_intent.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000014,
+      "created": 1010000010,
       "data": {
         "object": {
           "account_country": "US",
@@ -296,7 +475,7 @@
           "billing_reason": "manual",
           "charge": null,
           "collection_method": "charge_automatically",
-          "created": 1010000014,
+          "created": 1010000010,
           "currency": "usd",
           "custom_fields": null,
           "customer": "cus_NORMALIZED0001",
@@ -319,7 +498,7 @@
           "footer": null,
           "from_invoice": null,
           "hosted_invoice_url": null,
-          "id": "in_NORMALIZED00000000000004",
+          "id": "in_NORMALIZED00000000000002",
           "invoice_pdf": null,
           "issuer": {
             "type": "self"
@@ -336,8 +515,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000004",
-                "invoice_item": "ii_NORMALIZED00000000000004",
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -349,16 +529,16 @@
                 "price": {
                   "active": false,
                   "billing_scheme": "per_unit",
-                  "created": 1010000015,
+                  "created": 1010000011,
                   "currency": "usd",
                   "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000003",
+                  "id": "price_NORMALIZED00000000000002",
                   "livemode": false,
                   "lookup_key": null,
                   "metadata": {},
                   "nickname": null,
                   "object": "price",
-                  "product": "prod_NORMALIZED0003",
+                  "product": "prod_NORMALIZED0002",
                   "recurring": null,
                   "tax_behavior": "unspecified",
                   "tiers_mode": null,
@@ -382,7 +562,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
           },
           "livemode": false,
           "metadata": {},
@@ -435,22 +615,22 @@
           "total_excluding_tax": 136000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohun6DEQaroqDjsNbDdfukr",
+      "id": "evt_1OqSnYDEQaroqDjsvc5qlMS3",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0007",
-        "idempotency_key": "ede3caff-8f87-49b2-a3b2-c3a57e45b0bf"
+        "idempotency_key": "f5c5ca15-a57c-420a-a39c-abb2650a8368"
       },
       "type": "invoice.created"
     },
     {
       "api_version": "2020-08-27",
-      "created": 1010000016,
+      "created": 1010000012,
       "data": {
         "object": {
           "amount": 136000,
@@ -460,7 +640,7 @@
           "description": "Additional license (Jan 2, 2012 - Jan 2, 2013)",
           "discountable": false,
           "discounts": [],
-          "id": "ii_NORMALIZED00000000000004",
+          "id": "ii_NORMALIZED00000000000002",
           "invoice": null,
           "livemode": false,
           "metadata": {},
@@ -473,16 +653,16 @@
           "price": {
             "active": false,
             "billing_scheme": "per_unit",
-            "created": 1010000015,
+            "created": 1010000011,
             "currency": "usd",
             "custom_unit_amount": null,
-            "id": "price_NORMALIZED00000000000003",
+            "id": "price_NORMALIZED00000000000002",
             "livemode": false,
             "lookup_key": null,
             "metadata": {},
             "nickname": null,
             "object": "price",
-            "product": "prod_NORMALIZED0003",
+            "product": "prod_NORMALIZED0002",
             "recurring": null,
             "tax_behavior": "unspecified",
             "tiers_mode": null,
@@ -500,198 +680,15 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1Ohun5DEQaroqDjshPQq8t1X",
+      "id": "evt_1OqSnXDEQaroqDjsYLoyBMwn",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0008",
-        "idempotency_key": "b633ff8a-aaf7-426f-9b78-3632c884ee78"
+        "idempotency_key": "362cf1a5-2eb6-44f8-bdb7-2197ac625339"
       },
       "type": "invoiceitem.created"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1010000005,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1010000006,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU102009Aa5Xzi1?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU102009Aa5Xzi1/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1010000010,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "10"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0004",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1Ohun5DEQaroqDjs2FAispPc",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "ff10ab13-b318-4fd7-9daf-1a1dab620bb3"
-      },
-      "type": "invoice.payment_succeeded"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.5.json
index b3903f75bf..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.5.json
@@ -1,183 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1010000013,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 136000,
-          "amount_paid": 0,
-          "amount_remaining": 136000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": true,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
-          "created": 1010000014,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN?s=ap",
-          "id": "in_NORMALIZED00000000000004",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 136000,
-                "amount_excluding_tax": 136000,
-                "currency": "usd",
-                "description": "Additional license (Jan 2, 2012 - Jan 2, 2013)",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000004",
-                "invoice_item": "ii_NORMALIZED00000000000004",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1357095845,
-                  "start": 1325473445
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1010000015,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000003",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0003",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 17,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
-          },
-          "livemode": false,
-          "metadata": {},
-          "next_payment_attempt": 1000000000,
-          "number": "NORMALI-0005",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000004",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 136000,
-          "subtotal_excluding_tax": 136000,
-          "tax": null,
-          "test_clock": null,
-          "total": 136000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 136000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1Ohun7DEQaroqDjsBTPB56PN",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0006",
-        "idempotency_key": "8d5a00f1-3837-4959-8140-1f273f309091"
-      },
-      "type": "invoice.finalized"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.6.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.6.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.6.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.1.json
index 967bc8263c..8f3e5aaab2 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000006,
+  "created": 1010000007,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000010,
+          "created": 1010000008,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.2.json
index b05da25231..ea9afa1434 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.2.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000014,
+  "created": 1010000010,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -42,7 +42,7 @@
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000004",
+  "id": "in_NORMALIZED00000000000002",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000004",
-        "invoice_item": "ii_NORMALIZED00000000000004",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000015,
+          "created": 1010000011,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000003",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0003",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -105,7 +106,7 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
   "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 136000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.1.json
index 31eeff854a..85a3a6df99 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000006,
+  "created": 1010000007,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjUx0200A3rvpJk7?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMA0200ujF3GYcd?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjUx0200A3rvpJk7/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMA0200ujF3GYcd/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000010,
+          "created": 1010000008,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -116,7 +117,7 @@
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0004",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -164,5 +165,5 @@
   "total_excluding_tax": 48000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.2.json
index faad9edbc4..705ada9723 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.2.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "charge_automatically",
-  "created": 1010000014,
+  "created": 1010000010,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN?s=ap",
-  "id": "in_NORMALIZED00000000000004",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN/pdf?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1?s=ap",
+  "id": "in_NORMALIZED00000000000002",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000004",
-        "invoice_item": "ii_NORMALIZED00000000000004",
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000015,
+          "created": 1010000011,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000003",
+          "id": "price_NORMALIZED00000000000002",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0003",
+          "product": "prod_NORMALIZED0002",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -105,17 +106,17 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
   },
   "livemode": false,
   "metadata": {},
   "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0005",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
   "paid_out_of_band": false,
-  "payment_intent": "pi_NORMALIZED00000000000004",
+  "payment_intent": "pi_NORMALIZED00000000000002",
   "payment_settings": {
     "default_mandate": null,
     "payment_method_options": null,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.list.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.list.2.json
index ae1a8a3c95..3814955f87 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.list.2.json
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "charge_automatically",
-      "created": 1010000014,
+      "created": 1010000010,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU50200oVAdrCow?s=ap",
-      "id": "in_NORMALIZED00000000000004",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU50200oVAdrCow/pdf?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNg0200RSPCPBlW?s=ap",
+      "id": "in_NORMALIZED00000000000002",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNg0200RSPCPBlW/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -61,8 +61,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000004",
-            "invoice_item": "ii_NORMALIZED00000000000004",
+            "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
+            "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -74,16 +75,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000015,
+              "created": 1010000011,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000003",
+              "id": "price_NORMALIZED00000000000002",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0003",
+              "product": "prod_NORMALIZED0002",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -107,17 +108,17 @@
         "has_more": false,
         "object": "list",
         "total_count": 1,
-        "url": "/v1/invoices/in_NORMALIZED00000000000004/lines"
+        "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
       },
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": 1000000000,
-      "number": "NORMALI-0005",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": false,
       "paid_out_of_band": false,
-      "payment_intent": "pi_NORMALIZED00000000000004",
+      "payment_intent": "pi_NORMALIZED00000000000002",
       "payment_settings": {
         "default_mandate": null,
         "payment_method_options": null,
@@ -183,7 +184,7 @@
       "billing_reason": "manual",
       "charge": "ch_NORMALIZED00000000000001",
       "collection_method": "charge_automatically",
-      "created": 1010000006,
+      "created": 1010000007,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -205,9 +206,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU502006T6WnDbg?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwNg0200OFYXKgTW?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU502006T6WnDbg/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwNg0200OFYXKgTW/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -223,8 +224,9 @@
             "discount_amounts": [],
             "discountable": false,
             "discounts": [],
-            "id": "il_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
+            "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
+            "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
             "object": "line_item",
@@ -236,16 +238,16 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000010,
+              "created": 1010000008,
               "currency": "usd",
               "custom_unit_amount": null,
-              "id": "price_NORMALIZED00000000000002",
+              "id": "price_NORMALIZED00000000000001",
               "livemode": false,
               "lookup_key": null,
               "metadata": {},
               "nickname": null,
               "object": "price",
-              "product": "prod_NORMALIZED0002",
+              "product": "prod_NORMALIZED0001",
               "recurring": null,
               "tax_behavior": "unspecified",
               "tiers_mode": null,
@@ -280,7 +282,7 @@
         "user_id": "10"
       },
       "next_payment_attempt": null,
-      "number": "NORMALI-0004",
+      "number": "NORMALI-0002",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.pay.1.json
index 09f5dbe505..e8ba229202 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.pay.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": "ch_NORMALIZED00000000000001",
   "collection_method": "charge_automatically",
-  "created": 1010000006,
+  "created": 1010000007,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU00200ttHzRo8y?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMg0200jkv4fuMA?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrMVVkdE5XbkxMN0hRTVY4NURjcUJNeWE5NnF5LDk4MDI4NjU00200ttHzRo8y/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RSllHYmdnUUphSFlZVFo4anlJYWZUdGJMSWx5LDEwMDA2NjAwMg0200jkv4fuMA/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -59,8 +59,9 @@
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -72,16 +73,16 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000010,
+          "created": 1010000008,
           "currency": "usd",
           "custom_unit_amount": null,
-          "id": "price_NORMALIZED00000000000002",
+          "id": "price_NORMALIZED00000000000001",
           "livemode": false,
           "lookup_key": null,
           "metadata": {},
           "nickname": null,
           "object": "price",
-          "product": "prod_NORMALIZED0002",
+          "product": "prod_NORMALIZED0001",
           "recurring": null,
           "tax_behavior": "unspecified",
           "tiers_mode": null,
@@ -116,7 +117,7 @@
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0004",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.1.json
index 38644b98ed..c9255a8599 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.1.json
@@ -6,7 +6,7 @@
   "description": "Zulip Cloud Standard",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000002",
+  "id": "ii_NORMALIZED00000000000001",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000010,
+    "created": 1010000008,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000002",
+    "id": "price_NORMALIZED00000000000001",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0002",
+    "product": "prod_NORMALIZED0001",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.2.json
index 7c886428d3..d4327e4875 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.2.json
@@ -6,7 +6,7 @@
   "description": "Additional license (Jan 2, 2012 - Jan 2, 2013)",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000004",
+  "id": "ii_NORMALIZED00000000000002",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -19,16 +19,16 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000015,
+    "created": 1010000011,
     "currency": "usd",
     "custom_unit_amount": null,
-    "id": "price_NORMALIZED00000000000003",
+    "id": "price_NORMALIZED00000000000002",
     "livemode": false,
     "lookup_key": null,
     "metadata": {},
     "nickname": null,
     "object": "price",
-    "product": "prod_NORMALIZED0003",
+    "product": "prod_NORMALIZED0002",
     "recurring": null,
     "tax_behavior": "unspecified",
     "tiers_mode": null,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.create.1.json
index e989c8352b..4756e19232 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumxDEQaroqDjsge1ekoeC_secret_PWykoqqE9ZFxGEW9RCx5vkB0gUs2Kc3",
+  "client_secret": "seti_1OqSnQDEQaroqDjswxeQUjjO_secret_PfoQAOPwbETCh5LFNS6eMNDSKgv0NyF",
   "created": 1010000003,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumxDEQaroqDjsge1ekoeC",
+  "id": "seti_1OqSnQDEQaroqDjswxeQUjjO",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumxDEQaroqDjsGvEPeXvJ",
+  "latest_attempt": "setatt_1OqSnQDEQaroqDjsSTn8Ucby",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+  "payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.list.1.json
index aea2e47f07..6050f70816 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhumwDEQaroqDjsjzQi0XLM_secret_PWykKKNUlrca2U4shD2uGYZvB8ZNDBb",
-      "created": 1010000002,
+      "client_secret": "seti_1OqSnPDEQaroqDjsaooqCVUb_secret_PfoQN26iWxHdsylaRlXwbVpqfYD5EPp",
+      "created": 1010000013,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhumwDEQaroqDjsjzQi0XLM",
+      "id": "seti_1OqSnPDEQaroqDjsaooqCVUb",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.retrieve.1.json
index e989c8352b..4756e19232 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhumxDEQaroqDjsge1ekoeC_secret_PWykoqqE9ZFxGEW9RCx5vkB0gUs2Kc3",
+  "client_secret": "seti_1OqSnQDEQaroqDjswxeQUjjO_secret_PfoQAOPwbETCh5LFNS6eMNDSKgv0NyF",
   "created": 1010000003,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhumxDEQaroqDjsge1ekoeC",
+  "id": "seti_1OqSnQDEQaroqDjswxeQUjjO",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhumxDEQaroqDjsGvEPeXvJ",
+  "latest_attempt": "setatt_1OqSnQDEQaroqDjsSTn8Ucby",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhumxDEQaroqDjsppFs4Wsw",
+  "payment_method": "pm_1OqSnQDEQaroqDjsTWsgjhyv",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.create.1.json
index ec0c7e06c0..4f149ae70b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000002,
+  "created": 1010000013,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED028B7Ec29mMpaPsah2Ez0ZLd3ULPPyRJ0O26dkGgtJVCbJs5",
+  "id": "cs_test_NORMALIZED02PCPz1uq3TQ1QDkAeeoVG4gFXfXVm9u6V9CTo1D8tGocPIQ",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhumwDEQaroqDjsjzQi0XLM",
+  "setup_intent": "seti_1OqSnPDEQaroqDjsaooqCVUb",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028B7Ec29mMpaPsah2Ez0ZLd3ULPPyRJ0O26dkGgtJVCbJs5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02PCPz1uq3TQ1QDkAeeoVG4gFXfXVm9u6V9CTo1D8tGocPIQ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.list.1.json
index 74db5f6001..22b2cc8974 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000002,
+      "created": 1010000013,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED028B7Ec29mMpaPsah2Ez0ZLd3ULPPyRJ0O26dkGgtJVCbJs5",
+      "id": "cs_test_NORMALIZED02PCPz1uq3TQ1QDkAeeoVG4gFXfXVm9u6V9CTo1D8tGocPIQ",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhumwDEQaroqDjsjzQi0XLM",
+      "setup_intent": "seti_1OqSnPDEQaroqDjsaooqCVUb",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED028B7Ec29mMpaPsah2Ez0ZLd3ULPPyRJ0O26dkGgtJVCbJs5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02PCPz1uq3TQ1QDkAeeoVG4gFXfXVm9u6V9CTo1D8tGocPIQ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json
index 4bd8d49629..c9219e149c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json
@@ -2,8 +2,8 @@
   "address": null,
   "balance": 0,
   "created": 1010000001,
-  "currency": "usd",
-  "default_currency": "usd",
+  "currency": null,
+  "default_currency": null,
   "default_source": null,
   "delinquent": false,
   "description": "zulip (Zulip Dev)",
@@ -23,7 +23,7 @@
     "realm_str": "zulip"
   },
   "name": null,
-  "next_invoice_sequence": 2,
+  "next_invoice_sequence": 1,
   "object": "customer",
   "phone": null,
   "preferred_locales": [],
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.3.json
new file mode 100644
index 0000000000..cfc8347665
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.3.json
@@ -0,0 +1,33 @@
+{
+  "address": null,
+  "balance": 0,
+  "created": 1010000001,
+  "currency": "usd",
+  "default_currency": "usd",
+  "default_source": "src_NORMALIZED00000000000001",
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
+  "invoice_settings": {
+    "custom_fields": null,
+    "default_payment_method": null,
+    "footer": null,
+    "rendering_options": null
+  },
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "name": null,
+  "next_invoice_sequence": 2,
+  "object": "customer",
+  "phone": null,
+  "preferred_locales": [],
+  "shipping": null,
+  "tax_exempt": "none",
+  "test_clock": null
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.1.json
index b92e7079c8..041fccf746 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.1.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrT3hJMzhEcW5HNFdibDNWaUFOMUpLUVdPMHJXLDk4MDI4NjU30200JXwbILeN/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROFVDam9Dc3BvTThxUVZYd3lZWnlmdlJaeml2LDEwMDA2NjAwNQ0200K1tOGXh1/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -167,13 +168,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohun7DEQaroqDjsBTPB56PN",
+      "id": "evt_1OqSnZDEQaroqDjswSuiSkNJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "8d5a00f1-3837-4959-8140-1f273f309091"
+        "idempotency_key": "934451b6-f9f5-4f63-9e22-b128999f3d1c"
       },
       "type": "invoice.finalized"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.2.json
new file mode 100644
index 0000000000..ee4362c10c
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.2.json
@@ -0,0 +1,1098 @@
+{
+  "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000005,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1010000006,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMA0200KwGdIyPM?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMA0200KwGdIyPM/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000007,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": true,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "auto_advance": true,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "status": "open",
+          "status_transitions": {
+            "paid_at": null
+          }
+        }
+      },
+      "id": "evt_1OqSneDEQaroqDjsfJXtkLc3",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "3021799c-5028-4701-933f-f26765c26cb1"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000005,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": 1000000000,
+          "cancellation_reason": "requested_by_customer",
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
+          },
+          "client_secret": "pi_NORMALIZED00000000000002_secret_Dc7dllJNZBbo7c4iuo8oqdEUX",
+          "confirmation_method": "automatic",
+          "created": 1010000008,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000002",
+          "invoice": "in_NORMALIZED00000000000002",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
+          },
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "canceled",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSndDEQaroqDjs1pyyYmIv",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "3021799c-5028-4701-933f-f26765c26cb1"
+      },
+      "type": "payment_intent.canceled"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000008,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1010000006,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAwOQ0200rauenvM2?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAwOQ0200rauenvM2/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000007,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSneDEQaroqDjs7e4KHcp9",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "7f2f650b-2fbb-4e26-a54e-de07fac6f580"
+      },
+      "type": "invoice.finalized"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000008,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1010000006,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAwOQ0200rauenvM2?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAwOQ0200rauenvM2/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000007,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "effective_at": null,
+          "ending_balance": null,
+          "hosted_invoice_url": null,
+          "invoice_pdf": null,
+          "number": null,
+          "payment_intent": null,
+          "rendering": {
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null
+          }
+        }
+      },
+      "id": "evt_1OqSndDEQaroqDjsX7pGhKtr",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "7f2f650b-2fbb-4e26-a54e-de07fac6f580"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000008,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": null,
+          "cancellation_reason": null,
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
+          },
+          "client_secret": "pi_NORMALIZED00000000000002_secret_Dc7dllJNZBbo7c4iuo8oqdEUX",
+          "confirmation_method": "automatic",
+          "created": 1010000008,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000002",
+          "invoice": "in_NORMALIZED00000000000002",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {},
+            "wechat_pay": {
+              "app_id": null,
+              "client": null
+            }
+          },
+          "payment_method_types": [
+            "ach_credit_transfer",
+            "card",
+            "cashapp",
+            "wechat_pay"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "requires_payment_method",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSndDEQaroqDjs1XQ8Tucr",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "7f2f650b-2fbb-4e26-a54e-de07fac6f580"
+      },
+      "type": "payment_intent.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000006,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": true,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1010000006,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": null,
+          "ending_balance": null,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": null,
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": null,
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000007,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": null,
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSndDEQaroqDjsZHTC5T6E",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "29d2db22-9ae4-4a64-8f12-042983b040b0"
+      },
+      "type": "invoice.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000006,
+      "data": {
+        "object": {
+          "amount": 984000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "date": 1000000000,
+          "description": "Zulip Cloud Standard",
+          "discountable": false,
+          "discounts": [],
+          "id": "ii_NORMALIZED00000000000002",
+          "invoice": null,
+          "livemode": false,
+          "metadata": {},
+          "object": "invoiceitem",
+          "period": {
+            "end": 1000000000,
+            "start": 1000000000
+          },
+          "plan": null,
+          "price": {
+            "active": false,
+            "billing_scheme": "per_unit",
+            "created": 1010000007,
+            "currency": "usd",
+            "custom_unit_amount": null,
+            "id": "price_NORMALIZED00000000000002",
+            "livemode": false,
+            "lookup_key": null,
+            "metadata": {},
+            "nickname": null,
+            "object": "price",
+            "product": "prod_NORMALIZED0002",
+            "recurring": null,
+            "tax_behavior": "unspecified",
+            "tiers_mode": null,
+            "transform_quantity": null,
+            "type": "one_time",
+            "unit_amount": 8000,
+            "unit_amount_decimal": "8000"
+          },
+          "proration": false,
+          "quantity": 123,
+          "subscription": null,
+          "tax_rates": [],
+          "test_clock": null,
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        }
+      },
+      "id": "evt_1OqSncDEQaroqDjsv1ULmFMU",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "c5ff93c4-cbbf-4406-8ae6-03da0f37e538"
+      },
+      "type": "invoiceitem.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000006,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1010000001,
+          "currency": "usd",
+          "default_currency": "usd",
+          "default_source": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "currency": null,
+          "default_currency": null
+        }
+      },
+      "id": "evt_1OqSncDEQaroqDjspsdXGUEd",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "c5ff93c4-cbbf-4406-8ae6-03da0f37e538"
+      },
+      "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000001,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1010000001,
+          "currency": null,
+          "default_currency": null,
+          "default_source": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        }
+      },
+      "id": "evt_1OqSnbDEQaroqDjscoYEBbeE",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0006",
+        "idempotency_key": "55671ac8-f12d-403e-9fbc-3082256d2566"
+      },
+      "type": "customer.created"
+    }
+  ],
+  "has_more": false,
+  "object": "list",
+  "url": "/v1/events"
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.3.json
new file mode 100644
index 0000000000..e22ecc4c73
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.3.json
@@ -0,0 +1,301 @@
+{
+  "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000005,
+      "data": {
+        "object": {
+          "ach_credit_transfer": {
+            "account_number": "test_NORMALIZED02",
+            "bank_name": "TEST BANK",
+            "fingerprint": "NORMALIZED000001",
+            "refund_account_holder_name": null,
+            "refund_account_holder_type": null,
+            "refund_routing_number": null,
+            "routing_number": "110000000",
+            "swift_code": "TSTEZ122"
+          },
+          "amount": null,
+          "client_secret": "src_client_secret_NORMALIZED00000000000001",
+          "created": 1010000005,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "flow": "receiver",
+          "id": "src_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "source",
+          "owner": {
+            "address": null,
+            "email": "amount_0@stripe.com",
+            "name": null,
+            "phone": null,
+            "verified_address": null,
+            "verified_email": null,
+            "verified_name": null,
+            "verified_phone": null
+          },
+          "receiver": {
+            "address": "000000000-test_NORMALIZED01",
+            "amount_charged": 0,
+            "amount_received": 0,
+            "amount_returned": 0,
+            "refund_attributes_method": "email",
+            "refund_attributes_status": "missing"
+          },
+          "statement_descriptor": null,
+          "status": "pending",
+          "type": "ach_credit_transfer",
+          "usage": "reusable"
+        }
+      },
+      "id": "evt_1OqSneDEQaroqDjsSma3RO15",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "5bdc0496-04f9-4131-8cee-2d791a3e80df"
+      },
+      "type": "customer.source.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000005,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1010000001,
+          "currency": "usd",
+          "default_currency": "usd",
+          "default_source": "src_NORMALIZED00000000000001",
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 2,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "default_source": null
+        }
+      },
+      "id": "evt_1OqSnfDEQaroqDjsp0SUBTv6",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": null,
+        "idempotency_key": "5bdc0496-04f9-4131-8cee-2d791a3e80df"
+      },
+      "type": "customer.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1010000005,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 984000,
+          "amount_paid": 0,
+          "amount_remaining": 984000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "send_invoice",
+          "created": 1010000006,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": 1000000000,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMA0200KwGdIyPM?s=ap",
+          "id": "in_NORMALIZED00000000000002",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMA0200KwGdIyPM/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 984000,
+                "amount_excluding_tax": 984000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000002",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1010000007,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 123,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "manual",
+            "licenses": "123",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": true,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 984000,
+          "subtotal_excluding_tax": 984000,
+          "tax": null,
+          "test_clock": null,
+          "total": 984000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 984000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSneDEQaroqDjsdOiwDoJ1",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "3021799c-5028-4701-933f-f26765c26cb1"
+      },
+      "type": "invoice.paid"
+    }
+  ],
+  "has_more": false,
+  "object": "list",
+  "url": "/v1/events"
+}
diff --git a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.4.json
similarity index 100%
rename from corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.5.json
rename to corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.4.json
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.create.1.json
index 2195e64ec5..a3709fcc03 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.create.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "send_invoice",
-  "created": 1010000001,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000005,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000002",
@@ -110,6 +111,7 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
@@ -163,5 +165,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.finalize_invoice.1.json
index a6965d915b..2598f9e58d 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.finalize_invoice.1.json
@@ -19,7 +19,7 @@
   "billing_reason": "manual",
   "charge": null,
   "collection_method": "send_invoice",
-  "created": 1010000001,
+  "created": 1010000006,
   "currency": "usd",
   "custom_fields": null,
   "customer": "cus_NORMALIZED0001",
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVmJaNFppZHpuZ2lzcEJpM2x4VGVreVl2aUc1LDk4MDI4NjYy0200DIdLgvHl?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAwOQ0200rauenvM2?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVmJaNFppZHpuZ2lzcEJpM2x4VGVreVl2aUc1LDk4MDI4NjYy0200DIdLgvHl/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAwOQ0200rauenvM2/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -72,7 +73,7 @@
         "price": {
           "active": false,
           "billing_scheme": "per_unit",
-          "created": 1010000005,
+          "created": 1010000007,
           "currency": "usd",
           "custom_unit_amount": null,
           "id": "price_NORMALIZED00000000000002",
@@ -110,12 +111,13 @@
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
+    "license_management": "manual",
     "licenses": "123",
     "plan_tier": "1",
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0002",
+  "number": "NORMALI-0003",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
@@ -163,5 +165,5 @@
   "total_excluding_tax": 984000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.list.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.list.1.json
index f8fbea545a..7d7143dcfb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.list.1.json
@@ -12,7 +12,7 @@
       "application_fee_amount": null,
       "attempt_count": 0,
       "attempted": false,
-      "auto_advance": true,
+      "auto_advance": false,
       "automatic_tax": {
         "enabled": false,
         "liability": null,
@@ -21,7 +21,7 @@
       "billing_reason": "manual",
       "charge": null,
       "collection_method": "send_invoice",
-      "created": 1010000001,
+      "created": 1010000006,
       "currency": "usd",
       "custom_fields": null,
       "customer": "cus_NORMALIZED0001",
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVmJaNFppZHpuZ2lzcEJpM2x4VGVreVl2aUc1LDk4MDI4NjYz0200rE8YUwqi?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMg0200NJnWdpIO?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lrVmJaNFppZHpuZ2lzcEJpM2x4VGVreVl2aUc1LDk4MDI4NjYz0200rE8YUwqi/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMg0200NJnWdpIO/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
@@ -74,7 +75,7 @@
             "price": {
               "active": false,
               "billing_scheme": "per_unit",
-              "created": 1010000005,
+              "created": 1010000007,
               "currency": "usd",
               "custom_unit_amount": null,
               "id": "price_NORMALIZED00000000000002",
@@ -112,17 +113,18 @@
       "livemode": false,
       "metadata": {
         "billing_schedule": "1",
+        "license_management": "manual",
         "licenses": "123",
         "plan_tier": "1",
         "user_id": "10"
       },
       "next_payment_attempt": null,
-      "number": "NORMALI-0002",
+      "number": "NORMALI-0003",
       "object": "invoice",
       "on_behalf_of": null,
-      "paid": false,
-      "paid_out_of_band": false,
-      "payment_intent": "pi_NORMALIZED00000000000002",
+      "paid": true,
+      "paid_out_of_band": true,
+      "payment_intent": null,
       "payment_settings": {
         "default_mandate": null,
         "payment_method_options": null,
@@ -145,11 +147,11 @@
       "shipping_details": null,
       "starting_balance": 0,
       "statement_descriptor": "Zulip Cloud Standard",
-      "status": "open",
+      "status": "paid",
       "status_transitions": {
         "finalized_at": 1000000000,
         "marked_uncollectible_at": null,
-        "paid_at": null,
+        "paid_at": 1000000000,
         "voided_at": null
       },
       "subscription": null,
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.pay.1.json
new file mode 100644
index 0000000000..e07ab6b1de
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.pay.1.json
@@ -0,0 +1,169 @@
+{
+  "account_country": "US",
+  "account_name": "Kandra Labs, Inc.",
+  "account_tax_ids": null,
+  "amount_due": 984000,
+  "amount_paid": 0,
+  "amount_remaining": 984000,
+  "amount_shipping": 0,
+  "application": null,
+  "application_fee_amount": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "auto_advance": false,
+  "automatic_tax": {
+    "enabled": false,
+    "liability": null,
+    "status": null
+  },
+  "billing_reason": "manual",
+  "charge": null,
+  "collection_method": "send_invoice",
+  "created": 1010000006,
+  "currency": "usd",
+  "custom_fields": null,
+  "customer": "cus_NORMALIZED0001",
+  "customer_address": null,
+  "customer_email": "hamlet@zulip.com",
+  "customer_name": null,
+  "customer_phone": null,
+  "customer_shipping": null,
+  "customer_tax_exempt": "none",
+  "customer_tax_ids": [],
+  "default_payment_method": null,
+  "default_source": null,
+  "default_tax_rates": [],
+  "description": null,
+  "discount": null,
+  "discounts": [],
+  "due_date": 1000000000,
+  "effective_at": 1000000000,
+  "ending_balance": 0,
+  "footer": null,
+  "from_invoice": null,
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMA0200KwGdIyPM?s=ap",
+  "id": "in_NORMALIZED00000000000002",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9RUFpmWmllZmVFNW9UblFiYzkzQ0kwSW52S2dHLDEwMDA2NjAxMA0200KwGdIyPM/pdf?s=ap",
+  "issuer": {
+    "type": "self"
+  },
+  "last_finalization_error": null,
+  "latest_revision": null,
+  "lines": {
+    "data": [
+      {
+        "amount": 984000,
+        "amount_excluding_tax": 984000,
+        "currency": "usd",
+        "description": "Zulip Cloud Standard",
+        "discount_amounts": [],
+        "discountable": false,
+        "discounts": [],
+        "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
+        "invoice_item": "ii_NORMALIZED00000000000002",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1000000000,
+          "start": 1000000000
+        },
+        "plan": null,
+        "price": {
+          "active": false,
+          "billing_scheme": "per_unit",
+          "created": 1010000007,
+          "currency": "usd",
+          "custom_unit_amount": null,
+          "id": "price_NORMALIZED00000000000002",
+          "livemode": false,
+          "lookup_key": null,
+          "metadata": {},
+          "nickname": null,
+          "object": "price",
+          "product": "prod_NORMALIZED0002",
+          "recurring": null,
+          "tax_behavior": "unspecified",
+          "tiers_mode": null,
+          "transform_quantity": null,
+          "type": "one_time",
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        },
+        "proration": false,
+        "proration_details": {
+          "credited_items": null
+        },
+        "quantity": 123,
+        "subscription": null,
+        "tax_amounts": [],
+        "tax_rates": [],
+        "type": "invoiceitem",
+        "unit_amount_excluding_tax": "8000"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+  },
+  "livemode": false,
+  "metadata": {
+    "billing_schedule": "1",
+    "license_management": "manual",
+    "licenses": "123",
+    "plan_tier": "1",
+    "user_id": "10"
+  },
+  "next_payment_attempt": null,
+  "number": "NORMALI-0003",
+  "object": "invoice",
+  "on_behalf_of": null,
+  "paid": true,
+  "paid_out_of_band": true,
+  "payment_intent": null,
+  "payment_settings": {
+    "default_mandate": null,
+    "payment_method_options": null,
+    "payment_method_types": null
+  },
+  "period_end": 1000000000,
+  "period_start": 1000000000,
+  "post_payment_credit_notes_amount": 0,
+  "pre_payment_credit_notes_amount": 0,
+  "quote": null,
+  "receipt_number": null,
+  "rendering": {
+    "amount_tax_display": null,
+    "pdf": {
+      "page_size": "letter"
+    }
+  },
+  "rendering_options": null,
+  "shipping_cost": null,
+  "shipping_details": null,
+  "starting_balance": 0,
+  "statement_descriptor": "Zulip Cloud Standard",
+  "status": "paid",
+  "status_transitions": {
+    "finalized_at": 1000000000,
+    "marked_uncollectible_at": null,
+    "paid_at": 1000000000,
+    "voided_at": null
+  },
+  "subscription": null,
+  "subscription_details": {
+    "metadata": null
+  },
+  "subtotal": 984000,
+  "subtotal_excluding_tax": 984000,
+  "tax": null,
+  "test_clock": null,
+  "total": 984000,
+  "total_discount_amounts": [],
+  "total_excluding_tax": 984000,
+  "total_tax_amounts": [],
+  "transfer_data": null,
+  "webhooks_delivered_at": 1000000000
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_by_invoice--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/upgrade_by_invoice--InvoiceItem.create.1.json
index 203b3b0ffb..322aec25aa 100644
--- a/corporate/tests/stripe_fixtures/upgrade_by_invoice--InvoiceItem.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_by_invoice--InvoiceItem.create.1.json
@@ -19,7 +19,7 @@
   "price": {
     "active": false,
     "billing_scheme": "per_unit",
-    "created": 1010000005,
+    "created": 1010000007,
     "currency": "usd",
     "custom_unit_amount": null,
     "id": "price_NORMALIZED00000000000002",
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.modify.1.json
index 64d36d5083..b1fc836d46 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+    "default_payment_method": "pm_1OqSt0DEQaroqDjseX2BERQb",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.1.json
index 533b0161ad..45b995d8a6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+      "id": "pm_1OqSt0DEQaroqDjseX2BERQb",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.2.json
index 533b0161ad..45b995d8a6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+      "id": "pm_1OqSt0DEQaroqDjseX2BERQb",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.3.json
index 533b0161ad..45b995d8a6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+      "id": "pm_1OqSt0DEQaroqDjseX2BERQb",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.4.json
index 533b0161ad..45b995d8a6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+      "id": "pm_1OqSt0DEQaroqDjseX2BERQb",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.5.json
index 533b0161ad..45b995d8a6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+      "id": "pm_1OqSt0DEQaroqDjseX2BERQb",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.6.json
index 533b0161ad..45b995d8a6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+      "id": "pm_1OqSt0DEQaroqDjseX2BERQb",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.create.1.json
index 97d44a3a64..0cbed4cc81 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurcDEQaroqDjsaY017Kdl_secret_PWypnI4H8XSlgcVSjFfVYCrwWBD7BTI",
+  "client_secret": "seti_1OqSt1DEQaroqDjsXeBp7TAE_secret_PfoWigNQaKDHZs3SOPdh3r4wRnuhvCM",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurcDEQaroqDjsaY017Kdl",
+  "id": "seti_1OqSt1DEQaroqDjsXeBp7TAE",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurcDEQaroqDjsC0uZFyI0",
+  "latest_attempt": "setatt_1OqSt1DEQaroqDjsfFh20MOf",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+  "payment_method": "pm_1OqSt0DEQaroqDjseX2BERQb",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.list.1.json
index a39ce0daf6..9c3c84552c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhurcDEQaroqDjs3itpDdex_secret_PWyptKjxm7azoWYmFlU3OAD35eVjxh1",
+      "client_secret": "seti_1OqSt0DEQaroqDjsyLshCCKx_secret_PfoWvXNCUNqXfwLUnv3xIxKsRqN7ywO",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhurcDEQaroqDjs3itpDdex",
+      "id": "seti_1OqSt0DEQaroqDjsyLshCCKx",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.retrieve.1.json
index 97d44a3a64..0cbed4cc81 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurcDEQaroqDjsaY017Kdl_secret_PWypnI4H8XSlgcVSjFfVYCrwWBD7BTI",
+  "client_secret": "seti_1OqSt1DEQaroqDjsXeBp7TAE_secret_PfoWigNQaKDHZs3SOPdh3r4wRnuhvCM",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurcDEQaroqDjsaY017Kdl",
+  "id": "seti_1OqSt1DEQaroqDjsXeBp7TAE",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurcDEQaroqDjsC0uZFyI0",
+  "latest_attempt": "setatt_1OqSt1DEQaroqDjsfFh20MOf",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurcDEQaroqDjsk7KhJkfg",
+  "payment_method": "pm_1OqSt0DEQaroqDjseX2BERQb",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.create.1.json
index 9bfe08bd84..7451fac31b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01WBRWe1SB8MUQt4No7mu8BZwStcuS8HInNGJuuW2LQFH0vg",
+  "id": "cs_test_NORMALIZED01q0sBI8PRngdA54bwkk5RBPWRzf2lJWtceioLXOVSf8qDoD",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "11",
+    "remote_server_user_id": "13",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhurcDEQaroqDjs3itpDdex",
+  "setup_intent": "seti_1OqSt0DEQaroqDjsyLshCCKx",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01WBRWe1SB8MUQt4No7mu8BZwStcuS8HInNGJuuW2LQFH0vg#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01q0sBI8PRngdA54bwkk5RBPWRzf2lJWtceioLXOVSf8qDoD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.list.1.json
index 8ff03cd21e..c001bab358 100644
--- a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01WBRWe1SB8MUQt4No7mu8BZwStcuS8HInNGJuuW2LQFH0vg",
+      "id": "cs_test_NORMALIZED01q0sBI8PRngdA54bwkk5RBPWRzf2lJWtceioLXOVSf8qDoD",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "11",
+        "remote_server_user_id": "13",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhurcDEQaroqDjs3itpDdex",
+      "setup_intent": "seti_1OqSt0DEQaroqDjsyLshCCKx",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01WBRWe1SB8MUQt4No7mu8BZwStcuS8HInNGJuuW2LQFH0vg#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01q0sBI8PRngdA54bwkk5RBPWRzf2lJWtceioLXOVSf8qDoD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.modify.1.json
index 31a466faf5..03371754ec 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+    "default_payment_method": "pm_1OqSniDEQaroqDjsF0uGCKUY",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.1.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.10.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.10.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.10.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.10.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.11.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.11.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.11.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.11.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.12.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.12.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.12.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.12.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.13.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.13.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.13.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.13.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.14.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.14.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.14.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.14.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.15.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.15.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.15.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.15.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.16.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.16.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.16.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.16.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.17.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.17.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.17.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.17.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.18.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.18.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.18.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.18.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.19.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.19.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.19.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.19.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.2.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.20.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.20.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.20.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.20.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.21.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.21.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.21.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.21.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.22.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.22.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.22.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.22.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.23.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.23.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.23.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.23.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.24.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.24.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.24.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.24.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.25.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.25.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.25.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.25.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.26.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.26.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.26.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.26.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.27.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.27.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.27.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.27.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.28.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.28.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.28.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.28.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.3.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.4.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.5.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.6.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.7.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.7.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.7.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.7.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.8.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.8.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.8.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.8.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.9.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.9.json
index e33dd631d6..2ca09b4acc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.9.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.9.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+      "id": "pm_1OqSniDEQaroqDjsF0uGCKUY",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.create.1.json
index 9c3f531d6f..bb8fe3f9ad 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhunFDEQaroqDjsmG907rqk_secret_PWykxs9AWjSi9vDRyvwqrWH7bJNbMk7",
+  "client_secret": "seti_1OqSnjDEQaroqDjsP046QTnK_secret_PfoQh49X3P8CnMpedsCK8IDbSiSkuqS",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhunFDEQaroqDjsmG907rqk",
+  "id": "seti_1OqSnjDEQaroqDjsP046QTnK",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhunFDEQaroqDjsmSkLcmbK",
+  "latest_attempt": "setatt_1OqSnjDEQaroqDjsyzWsi2IG",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+  "payment_method": "pm_1OqSniDEQaroqDjsF0uGCKUY",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.list.1.json
index 779bb08c1b..6eb2e532b8 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhunEDEQaroqDjsXVHrF4MV_secret_PWykLwgG68txJd9sKWAC8AOwTt3vFDI",
-      "created": 1010000001,
+      "client_secret": "seti_1OqSniDEQaroqDjsWEylgOvm_secret_PfoQ01oCVrYGe1cBTBTLbBzCs8HPe2H",
+      "created": 1010000003,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhunEDEQaroqDjsXVHrF4MV",
+      "id": "seti_1OqSniDEQaroqDjsWEylgOvm",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.retrieve.1.json
index 9c3f531d6f..bb8fe3f9ad 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhunFDEQaroqDjsmG907rqk_secret_PWykxs9AWjSi9vDRyvwqrWH7bJNbMk7",
+  "client_secret": "seti_1OqSnjDEQaroqDjsP046QTnK_secret_PfoQh49X3P8CnMpedsCK8IDbSiSkuqS",
   "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhunFDEQaroqDjsmG907rqk",
+  "id": "seti_1OqSnjDEQaroqDjsP046QTnK",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhunFDEQaroqDjsmSkLcmbK",
+  "latest_attempt": "setatt_1OqSnjDEQaroqDjsyzWsi2IG",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhunFDEQaroqDjsDMkZOo3T",
+  "payment_method": "pm_1OqSniDEQaroqDjsF0uGCKUY",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.create.1.json
index 40fdd60c95..7cfaf64c92 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000001,
+  "created": 1010000003,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01QxNzb4qnBPnbvN7Txt0MOBqB1gXLO7BzLO3uBsBpVp7gsh",
+  "id": "cs_test_NORMALIZED01HrYnxK5os3AufduaeHGZ7gtm6p84dXGbl0rZXOnfCEQU5X",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhunEDEQaroqDjsXVHrF4MV",
+  "setup_intent": "seti_1OqSniDEQaroqDjsWEylgOvm",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01QxNzb4qnBPnbvN7Txt0MOBqB1gXLO7BzLO3uBsBpVp7gsh#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01HrYnxK5os3AufduaeHGZ7gtm6p84dXGbl0rZXOnfCEQU5X#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.list.1.json
index 7ef4eef0d0..1c39a34047 100644
--- a/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000001,
+      "created": 1010000003,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01QxNzb4qnBPnbvN7Txt0MOBqB1gXLO7BzLO3uBsBpVp7gsh",
+      "id": "cs_test_NORMALIZED01HrYnxK5os3AufduaeHGZ7gtm6p84dXGbl0rZXOnfCEQU5X",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhunEDEQaroqDjsXVHrF4MV",
+      "setup_intent": "seti_1OqSniDEQaroqDjsWEylgOvm",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01QxNzb4qnBPnbvN7Txt0MOBqB1gXLO7BzLO3uBsBpVp7gsh#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01HrYnxK5os3AufduaeHGZ7gtm6p84dXGbl0rZXOnfCEQU5X#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.create.1.json
new file mode 100644
index 0000000000..593a07ed0c
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.create.1.json
@@ -0,0 +1,33 @@
+{
+  "address": null,
+  "balance": 0,
+  "created": 1000000000,
+  "currency": null,
+  "default_currency": null,
+  "default_source": null,
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
+  "invoice_settings": {
+    "custom_fields": null,
+    "default_payment_method": null,
+    "footer": null,
+    "rendering_options": null
+  },
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "name": null,
+  "next_invoice_sequence": 1,
+  "object": "customer",
+  "phone": null,
+  "preferred_locales": [],
+  "shipping": null,
+  "tax_exempt": "none",
+  "test_clock": null
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.1.json
new file mode 100644
index 0000000000..593a07ed0c
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.1.json
@@ -0,0 +1,33 @@
+{
+  "address": null,
+  "balance": 0,
+  "created": 1000000000,
+  "currency": null,
+  "default_currency": null,
+  "default_source": null,
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
+  "invoice_settings": {
+    "custom_fields": null,
+    "default_payment_method": null,
+    "footer": null,
+    "rendering_options": null
+  },
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "name": null,
+  "next_invoice_sequence": 1,
+  "object": "customer",
+  "phone": null,
+  "preferred_locales": [],
+  "shipping": null,
+  "tax_exempt": "none",
+  "test_clock": null
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.2.json
new file mode 100644
index 0000000000..1648fcf935
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.2.json
@@ -0,0 +1,33 @@
+{
+  "address": null,
+  "balance": 0,
+  "created": 1000000000,
+  "currency": "usd",
+  "default_currency": "usd",
+  "default_source": null,
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_NORMALIZED0001",
+  "invoice_prefix": "NORMA01",
+  "invoice_settings": {
+    "custom_fields": null,
+    "default_payment_method": null,
+    "footer": null,
+    "rendering_options": null
+  },
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "name": null,
+  "next_invoice_sequence": 2,
+  "object": "customer",
+  "phone": null,
+  "preferred_locales": [],
+  "shipping": null,
+  "tax_exempt": "none",
+  "test_clock": null
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.2.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.create.1.json
similarity index 83%
rename from corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.2.json
rename to corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.create.1.json
index c61c02b20f..3b447ac55f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.create.1.json
@@ -2,15 +2,15 @@
   "account_country": "US",
   "account_name": "Kandra Labs, Inc.",
   "account_tax_ids": null,
-  "amount_due": 48000,
+  "amount_due": 320000,
   "amount_paid": 0,
-  "amount_remaining": 48000,
+  "amount_remaining": 320000,
   "amount_shipping": 0,
   "application": null,
   "application_fee_amount": null,
   "attempt_count": 0,
   "attempted": false,
-  "auto_advance": false,
+  "auto_advance": true,
   "automatic_tax": {
     "enabled": false,
     "liability": null,
@@ -18,7 +18,7 @@
   },
   "billing_reason": "manual",
   "charge": null,
-  "collection_method": "charge_automatically",
+  "collection_method": "send_invoice",
   "created": 1000000000,
   "currency": "usd",
   "custom_fields": null,
@@ -36,13 +36,13 @@
   "description": null,
   "discount": null,
   "discounts": [],
-  "due_date": null,
+  "due_date": 1000000000,
   "effective_at": null,
   "ending_balance": null,
   "footer": null,
   "from_invoice": null,
   "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000002",
+  "id": "in_NORMALIZED00000000000001",
   "invoice_pdf": null,
   "issuer": {
     "type": "self"
@@ -52,15 +52,16 @@
   "lines": {
     "data": [
       {
-        "amount": 48000,
-        "amount_excluding_tax": 48000,
+        "amount": 320000,
+        "amount_excluding_tax": 320000,
         "currency": "usd",
         "description": "Zulip Cloud Standard",
         "discount_amounts": [],
         "discountable": false,
         "discounts": [],
-        "id": "il_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
         "object": "line_item",
@@ -94,7 +95,7 @@
         "proration_details": {
           "credited_items": null
         },
-        "quantity": 6,
+        "quantity": 40,
         "subscription": null,
         "tax_amounts": [],
         "tax_rates": [],
@@ -105,15 +106,15 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
   },
   "livemode": false,
   "metadata": {
     "billing_schedule": "1",
-    "license_management": "automatic",
-    "licenses": "6",
+    "license_management": "manual",
+    "licenses": "40",
     "plan_tier": "1",
-    "user_id": "12"
+    "user_id": "10"
   },
   "next_payment_attempt": null,
   "number": null,
@@ -155,14 +156,14 @@
   "subscription_details": {
     "metadata": null
   },
-  "subtotal": 48000,
-  "subtotal_excluding_tax": 48000,
+  "subtotal": 320000,
+  "subtotal_excluding_tax": 320000,
   "tax": null,
   "test_clock": null,
-  "total": 48000,
+  "total": 320000,
   "total_discount_amounts": [],
-  "total_excluding_tax": 48000,
+  "total_excluding_tax": 320000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.finalize_invoice.1.json
new file mode 100644
index 0000000000..9792b5ef95
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.finalize_invoice.1.json
@@ -0,0 +1,169 @@
+{
+  "account_country": "US",
+  "account_name": "Kandra Labs, Inc.",
+  "account_tax_ids": null,
+  "amount_due": 320000,
+  "amount_paid": 0,
+  "amount_remaining": 320000,
+  "amount_shipping": 0,
+  "application": null,
+  "application_fee_amount": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "auto_advance": true,
+  "automatic_tax": {
+    "enabled": false,
+    "liability": null,
+    "status": null
+  },
+  "billing_reason": "manual",
+  "charge": null,
+  "collection_method": "send_invoice",
+  "created": 1000000000,
+  "currency": "usd",
+  "custom_fields": null,
+  "customer": "cus_NORMALIZED0001",
+  "customer_address": null,
+  "customer_email": "hamlet@zulip.com",
+  "customer_name": null,
+  "customer_phone": null,
+  "customer_shipping": null,
+  "customer_tax_exempt": "none",
+  "customer_tax_ids": [],
+  "default_payment_method": null,
+  "default_source": null,
+  "default_tax_rates": [],
+  "description": null,
+  "discount": null,
+  "discounts": [],
+  "due_date": 1000000000,
+  "effective_at": 1000000000,
+  "ending_balance": 0,
+  "footer": null,
+  "from_invoice": null,
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjAyOQ0200FUiNRsZE?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjAyOQ0200FUiNRsZE/pdf?s=ap",
+  "issuer": {
+    "type": "self"
+  },
+  "last_finalization_error": null,
+  "latest_revision": null,
+  "lines": {
+    "data": [
+      {
+        "amount": 320000,
+        "amount_excluding_tax": 320000,
+        "currency": "usd",
+        "description": "Zulip Cloud Standard",
+        "discount_amounts": [],
+        "discountable": false,
+        "discounts": [],
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1000000000,
+          "start": 1000000000
+        },
+        "plan": null,
+        "price": {
+          "active": false,
+          "billing_scheme": "per_unit",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_unit_amount": null,
+          "id": "price_NORMALIZED00000000000001",
+          "livemode": false,
+          "lookup_key": null,
+          "metadata": {},
+          "nickname": null,
+          "object": "price",
+          "product": "prod_NORMALIZED0001",
+          "recurring": null,
+          "tax_behavior": "unspecified",
+          "tiers_mode": null,
+          "transform_quantity": null,
+          "type": "one_time",
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        },
+        "proration": false,
+        "proration_details": {
+          "credited_items": null
+        },
+        "quantity": 40,
+        "subscription": null,
+        "tax_amounts": [],
+        "tax_rates": [],
+        "type": "invoiceitem",
+        "unit_amount_excluding_tax": "8000"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+  },
+  "livemode": false,
+  "metadata": {
+    "billing_schedule": "1",
+    "license_management": "manual",
+    "licenses": "40",
+    "plan_tier": "1",
+    "user_id": "10"
+  },
+  "next_payment_attempt": null,
+  "number": "NORMALI-0001",
+  "object": "invoice",
+  "on_behalf_of": null,
+  "paid": false,
+  "paid_out_of_band": false,
+  "payment_intent": "pi_NORMALIZED00000000000001",
+  "payment_settings": {
+    "default_mandate": null,
+    "payment_method_options": null,
+    "payment_method_types": null
+  },
+  "period_end": 1000000000,
+  "period_start": 1000000000,
+  "post_payment_credit_notes_amount": 0,
+  "pre_payment_credit_notes_amount": 0,
+  "quote": null,
+  "receipt_number": null,
+  "rendering": {
+    "amount_tax_display": null,
+    "pdf": {
+      "page_size": "letter"
+    }
+  },
+  "rendering_options": null,
+  "shipping_cost": null,
+  "shipping_details": null,
+  "starting_balance": 0,
+  "statement_descriptor": "Zulip Cloud Standard",
+  "status": "open",
+  "status_transitions": {
+    "finalized_at": 1000000000,
+    "marked_uncollectible_at": null,
+    "paid_at": null,
+    "voided_at": null
+  },
+  "subscription": null,
+  "subscription_details": {
+    "metadata": null
+  },
+  "subtotal": 320000,
+  "subtotal_excluding_tax": 320000,
+  "tax": null,
+  "test_clock": null,
+  "total": 320000,
+  "total_discount_amounts": [],
+  "total_excluding_tax": 320000,
+  "total_tax_amounts": [],
+  "transfer_data": null,
+  "webhooks_delivered_at": 1000000000
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.refresh.1.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.refresh.1.json
new file mode 100644
index 0000000000..bfb8cdd234
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.refresh.1.json
@@ -0,0 +1,169 @@
+{
+  "account_country": "US",
+  "account_name": "Kandra Labs, Inc.",
+  "account_tax_ids": null,
+  "amount_due": 320000,
+  "amount_paid": 0,
+  "amount_remaining": 320000,
+  "amount_shipping": 0,
+  "application": null,
+  "application_fee_amount": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "auto_advance": true,
+  "automatic_tax": {
+    "enabled": false,
+    "liability": null,
+    "status": null
+  },
+  "billing_reason": "manual",
+  "charge": null,
+  "collection_method": "send_invoice",
+  "created": 1000000000,
+  "currency": "usd",
+  "custom_fields": null,
+  "customer": "cus_NORMALIZED0001",
+  "customer_address": null,
+  "customer_email": "hamlet@zulip.com",
+  "customer_name": null,
+  "customer_phone": null,
+  "customer_shipping": null,
+  "customer_tax_exempt": "none",
+  "customer_tax_ids": [],
+  "default_payment_method": null,
+  "default_source": null,
+  "default_tax_rates": [],
+  "description": null,
+  "discount": null,
+  "discounts": [],
+  "due_date": 1000000000,
+  "effective_at": 1000000000,
+  "ending_balance": 0,
+  "footer": null,
+  "from_invoice": null,
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjAzMA0200MbmtbrMw?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjAzMA0200MbmtbrMw/pdf?s=ap",
+  "issuer": {
+    "type": "self"
+  },
+  "last_finalization_error": null,
+  "latest_revision": null,
+  "lines": {
+    "data": [
+      {
+        "amount": 320000,
+        "amount_excluding_tax": 320000,
+        "currency": "usd",
+        "description": "Zulip Cloud Standard",
+        "discount_amounts": [],
+        "discountable": false,
+        "discounts": [],
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1000000000,
+          "start": 1000000000
+        },
+        "plan": null,
+        "price": {
+          "active": false,
+          "billing_scheme": "per_unit",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_unit_amount": null,
+          "id": "price_NORMALIZED00000000000001",
+          "livemode": false,
+          "lookup_key": null,
+          "metadata": {},
+          "nickname": null,
+          "object": "price",
+          "product": "prod_NORMALIZED0001",
+          "recurring": null,
+          "tax_behavior": "unspecified",
+          "tiers_mode": null,
+          "transform_quantity": null,
+          "type": "one_time",
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        },
+        "proration": false,
+        "proration_details": {
+          "credited_items": null
+        },
+        "quantity": 40,
+        "subscription": null,
+        "tax_amounts": [],
+        "tax_rates": [],
+        "type": "invoiceitem",
+        "unit_amount_excluding_tax": "8000"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+  },
+  "livemode": false,
+  "metadata": {
+    "billing_schedule": "1",
+    "license_management": "manual",
+    "licenses": "40",
+    "plan_tier": "1",
+    "user_id": "10"
+  },
+  "next_payment_attempt": null,
+  "number": "NORMALI-0001",
+  "object": "invoice",
+  "on_behalf_of": null,
+  "paid": false,
+  "paid_out_of_band": false,
+  "payment_intent": "pi_NORMALIZED00000000000001",
+  "payment_settings": {
+    "default_mandate": null,
+    "payment_method_options": null,
+    "payment_method_types": null
+  },
+  "period_end": 1000000000,
+  "period_start": 1000000000,
+  "post_payment_credit_notes_amount": 0,
+  "pre_payment_credit_notes_amount": 0,
+  "quote": null,
+  "receipt_number": null,
+  "rendering": {
+    "amount_tax_display": null,
+    "pdf": {
+      "page_size": "letter"
+    }
+  },
+  "rendering_options": null,
+  "shipping_cost": null,
+  "shipping_details": null,
+  "starting_balance": 0,
+  "statement_descriptor": "Zulip Cloud Standard",
+  "status": "open",
+  "status_transitions": {
+    "finalized_at": 1000000000,
+    "marked_uncollectible_at": null,
+    "paid_at": null,
+    "voided_at": null
+  },
+  "subscription": null,
+  "subscription_details": {
+    "metadata": null
+  },
+  "subtotal": 320000,
+  "subtotal_excluding_tax": 320000,
+  "tax": null,
+  "test_clock": null,
+  "total": 320000,
+  "total_discount_amounts": [],
+  "total_excluding_tax": 320000,
+  "total_tax_amounts": [],
+  "transfer_data": null,
+  "webhooks_delivered_at": 1000000000
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.retrieve.1.json
new file mode 100644
index 0000000000..bfb8cdd234
--- /dev/null
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.retrieve.1.json
@@ -0,0 +1,169 @@
+{
+  "account_country": "US",
+  "account_name": "Kandra Labs, Inc.",
+  "account_tax_ids": null,
+  "amount_due": 320000,
+  "amount_paid": 0,
+  "amount_remaining": 320000,
+  "amount_shipping": 0,
+  "application": null,
+  "application_fee_amount": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "auto_advance": true,
+  "automatic_tax": {
+    "enabled": false,
+    "liability": null,
+    "status": null
+  },
+  "billing_reason": "manual",
+  "charge": null,
+  "collection_method": "send_invoice",
+  "created": 1000000000,
+  "currency": "usd",
+  "custom_fields": null,
+  "customer": "cus_NORMALIZED0001",
+  "customer_address": null,
+  "customer_email": "hamlet@zulip.com",
+  "customer_name": null,
+  "customer_phone": null,
+  "customer_shipping": null,
+  "customer_tax_exempt": "none",
+  "customer_tax_ids": [],
+  "default_payment_method": null,
+  "default_source": null,
+  "default_tax_rates": [],
+  "description": null,
+  "discount": null,
+  "discounts": [],
+  "due_date": 1000000000,
+  "effective_at": 1000000000,
+  "ending_balance": 0,
+  "footer": null,
+  "from_invoice": null,
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjAzMA0200MbmtbrMw?s=ap",
+  "id": "in_NORMALIZED00000000000001",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9ROWdiTG0yVXFlbnR6NzQ2UzU0Yld3RzgwcnNJLDEwMDA2NjAzMA0200MbmtbrMw/pdf?s=ap",
+  "issuer": {
+    "type": "self"
+  },
+  "last_finalization_error": null,
+  "latest_revision": null,
+  "lines": {
+    "data": [
+      {
+        "amount": 320000,
+        "amount_excluding_tax": 320000,
+        "currency": "usd",
+        "description": "Zulip Cloud Standard",
+        "discount_amounts": [],
+        "discountable": false,
+        "discounts": [],
+        "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
+        "invoice_item": "ii_NORMALIZED00000000000001",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1000000000,
+          "start": 1000000000
+        },
+        "plan": null,
+        "price": {
+          "active": false,
+          "billing_scheme": "per_unit",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_unit_amount": null,
+          "id": "price_NORMALIZED00000000000001",
+          "livemode": false,
+          "lookup_key": null,
+          "metadata": {},
+          "nickname": null,
+          "object": "price",
+          "product": "prod_NORMALIZED0001",
+          "recurring": null,
+          "tax_behavior": "unspecified",
+          "tiers_mode": null,
+          "transform_quantity": null,
+          "type": "one_time",
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        },
+        "proration": false,
+        "proration_details": {
+          "credited_items": null
+        },
+        "quantity": 40,
+        "subscription": null,
+        "tax_amounts": [],
+        "tax_rates": [],
+        "type": "invoiceitem",
+        "unit_amount_excluding_tax": "8000"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+  },
+  "livemode": false,
+  "metadata": {
+    "billing_schedule": "1",
+    "license_management": "manual",
+    "licenses": "40",
+    "plan_tier": "1",
+    "user_id": "10"
+  },
+  "next_payment_attempt": null,
+  "number": "NORMALI-0001",
+  "object": "invoice",
+  "on_behalf_of": null,
+  "paid": false,
+  "paid_out_of_band": false,
+  "payment_intent": "pi_NORMALIZED00000000000001",
+  "payment_settings": {
+    "default_mandate": null,
+    "payment_method_options": null,
+    "payment_method_types": null
+  },
+  "period_end": 1000000000,
+  "period_start": 1000000000,
+  "post_payment_credit_notes_amount": 0,
+  "pre_payment_credit_notes_amount": 0,
+  "quote": null,
+  "receipt_number": null,
+  "rendering": {
+    "amount_tax_display": null,
+    "pdf": {
+      "page_size": "letter"
+    }
+  },
+  "rendering_options": null,
+  "shipping_cost": null,
+  "shipping_details": null,
+  "starting_balance": 0,
+  "statement_descriptor": "Zulip Cloud Standard",
+  "status": "open",
+  "status_transitions": {
+    "finalized_at": 1000000000,
+    "marked_uncollectible_at": null,
+    "paid_at": null,
+    "voided_at": null
+  },
+  "subscription": null,
+  "subscription_details": {
+    "metadata": null
+  },
+  "subtotal": 320000,
+  "subtotal_excluding_tax": 320000,
+  "tax": null,
+  "test_clock": null,
+  "total": 320000,
+  "total_discount_amounts": [],
+  "total_excluding_tax": 320000,
+  "total_tax_amounts": [],
+  "transfer_data": null,
+  "webhooks_delivered_at": 1000000000
+}
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--InvoiceItem.create.1.json
similarity index 93%
rename from corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--InvoiceItem.create.2.json
rename to corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--InvoiceItem.create.1.json
index 75b3e157f4..3e11ba9868 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--InvoiceItem.create.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--InvoiceItem.create.1.json
@@ -1,12 +1,12 @@
 {
-  "amount": 48000,
+  "amount": 320000,
   "currency": "usd",
   "customer": "cus_NORMALIZED0001",
   "date": 1000000000,
   "description": "Zulip Cloud Standard",
   "discountable": false,
   "discounts": [],
-  "id": "ii_NORMALIZED00000000000002",
+  "id": "ii_NORMALIZED00000000000001",
   "invoice": null,
   "livemode": false,
   "metadata": {},
@@ -38,7 +38,7 @@
     "unit_amount_decimal": "8000"
   },
   "proration": false,
-  "quantity": 6,
+  "quantity": 40,
   "subscription": null,
   "tax_rates": [],
   "test_clock": null,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.modify.1.json
index a0e09ce5f3..63f345dbcc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+    "default_payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.1.json
index dce6ecfa8e..de7f099178 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+      "id": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.2.json
index 3c3a9a9406..de7f099178 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.2.json
@@ -2,8 +2,8 @@
   "address": null,
   "balance": 0,
   "created": 1000000000,
-  "currency": "usd",
-  "default_currency": "usd",
+  "currency": null,
+  "default_currency": null,
   "default_source": null,
   "delinquent": false,
   "description": "zulip (Zulip Dev)",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+      "id": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -69,7 +70,7 @@
     "realm_str": "zulip"
   },
   "name": null,
-  "next_invoice_sequence": 2,
+  "next_invoice_sequence": 1,
   "object": "customer",
   "phone": null,
   "preferred_locales": [],
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.3.json
index 3c3a9a9406..de7f099178 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.3.json
@@ -2,8 +2,8 @@
   "address": null,
   "balance": 0,
   "created": 1000000000,
-  "currency": "usd",
-  "default_currency": "usd",
+  "currency": null,
+  "default_currency": null,
   "default_source": null,
   "delinquent": false,
   "description": "zulip (Zulip Dev)",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+      "id": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -69,7 +70,7 @@
     "realm_str": "zulip"
   },
   "name": null,
-  "next_invoice_sequence": 2,
+  "next_invoice_sequence": 1,
   "object": "customer",
   "phone": null,
   "preferred_locales": [],
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.4.json
index 3c3a9a9406..34b771fe43 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+      "id": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.1.json
index c686291ffc..a36da67007 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+            "default_payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhunUDEQaroqDjsT6LJbnEJ",
+      "id": "evt_1Oqp93DEQaroqDjsK5tny2tw",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "49d42b8a-d0e2-4ca6-910f-f4887fa20d12"
+        "idempotency_key": "997f3d25-d048-4d37-b408-21dcaa970ac6"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.2.json
index 00a180add3..9e2219329b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.2.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -173,15 +174,1290 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhunaDEQaroqDjsFGj3eXCF",
+      "id": "evt_1Oqp99DEQaroqDjsY58XoL7Y",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "95217da2-3c4d-4158-b903-588fb8f1b1ac"
+        "idempotency_key": "54eb13e4-1d55-4a0e-96ef-344481a41f55"
       },
-      "type": "invoice.payment_succeeded"
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "amount_paid": 0,
+          "amount_remaining": 48000,
+          "attempt_count": 0,
+          "attempted": false,
+          "charge": null,
+          "paid": false,
+          "status": "open",
+          "status_transitions": {
+            "paid_at": null
+          }
+        }
+      },
+      "id": "evt_1Oqp99DEQaroqDjskXIVuNXr",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "54eb13e4-1d55-4a0e-96ef-344481a41f55"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 48000,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": null,
+          "cancellation_reason": null,
+          "capture_method": "automatic",
+          "charges": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_captured": 48000,
+                "amount_refunded": 0,
+                "application": null,
+                "application_fee": null,
+                "application_fee_amount": null,
+                "balance_transaction": "txn_NORMALIZED00000000000001",
+                "billing_details": {
+                  "address": {
+                    "city": null,
+                    "country": null,
+                    "line1": null,
+                    "line2": null,
+                    "postal_code": null,
+                    "state": null
+                  },
+                  "email": null,
+                  "name": null,
+                  "phone": null
+                },
+                "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+                "captured": true,
+                "created": 1000000000,
+                "currency": "usd",
+                "customer": "cus_NORMALIZED0001",
+                "description": "Payment for Invoice",
+                "destination": null,
+                "dispute": null,
+                "disputed": false,
+                "failure_balance_transaction": null,
+                "failure_code": null,
+                "failure_message": null,
+                "fraud_details": {},
+                "id": "ch_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "charge",
+                "on_behalf_of": null,
+                "order": null,
+                "outcome": {
+                  "network_status": "approved_by_network",
+                  "reason": null,
+                  "risk_level": "normal",
+                  "risk_score": 0,
+                  "seller_message": "Payment complete.",
+                  "type": "authorized"
+                },
+                "paid": true,
+                "payment_intent": "pi_NORMALIZED00000000000001",
+                "payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
+                "payment_method_details": {
+                  "card": {
+                    "amount_authorized": 48000,
+                    "brand": "visa",
+                    "checks": {
+                      "address_line1_check": null,
+                      "address_postal_code_check": null,
+                      "cvc_check": "pass"
+                    },
+                    "country": "US",
+                    "exp_month": 3,
+                    "exp_year": 2025,
+                    "extended_authorization": {
+                      "status": "disabled"
+                    },
+                    "fingerprint": "NORMALIZED000001",
+                    "funding": "credit",
+                    "incremental_authorization": {
+                      "status": "unavailable"
+                    },
+                    "installments": null,
+                    "last4": "4242",
+                    "mandate": null,
+                    "multicapture": {
+                      "status": "unavailable"
+                    },
+                    "network": "visa",
+                    "network_token": {
+                      "used": false
+                    },
+                    "overcapture": {
+                      "maximum_amount_capturable": 48000,
+                      "status": "unavailable"
+                    },
+                    "three_d_secure": null,
+                    "wallet": null
+                  },
+                  "type": "card"
+                },
+                "radar_options": {},
+                "receipt_email": "hamlet@zulip.com",
+                "receipt_number": null,
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOewmq8GMgZJQYP9E3A6LBZv9jM2yiohJNaKgNqd-BIDuoD8jJqxaI96xKgwJgqqnpIi1vkZeu46IyAB?s=ap",
+                "refunded": false,
+                "refunds": {
+                  "data": [],
+                  "has_more": false,
+                  "object": "list",
+                  "total_count": 0,
+                  "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+                },
+                "review": null,
+                "shipping": null,
+                "source": null,
+                "source_transfer": null,
+                "statement_descriptor": "Zulip Cloud Standard",
+                "statement_descriptor_suffix": null,
+                "status": "succeeded",
+                "transfer_data": null,
+                "transfer_group": null
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+          },
+          "client_secret": "pi_NORMALIZED00000000000001_secret_1WCS91Fgcs94XHz13VDhYFEPM",
+          "confirmation_method": "automatic",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "last_payment_error": null,
+          "latest_charge": "ch_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {}
+          },
+          "payment_method_types": [
+            "card",
+            "cashapp"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3Oqp96DEQaroqDjs0DANk6f8",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "54eb13e4-1d55-4a0e-96ef-344481a41f55"
+      },
+      "type": "payment_intent.succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_captured": 48000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 48000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 48000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKOewmq8GMga2VcjGrtE6LBZD1V5Q8VC0p49g4P9zv2MLT6XQ6nhSPAe-XSqo_fzRU51ht-oMkczIg0WT?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3Oqp96DEQaroqDjs00uJCKx5",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "54eb13e4-1d55-4a0e-96ef-344481a41f55"
+      },
+      "type": "charge.succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 0,
+          "amount_remaining": 48000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkwOQ02009yBCHzuV?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkwOQ02009yBCHzuV/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": null
+        }
+      },
+      "id": "evt_1Oqp97DEQaroqDjs1jagW09z",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "0984dd6c-6d8e-4cd6-b2b3-872860807037"
+      },
+      "type": "invoice.finalized"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 0,
+          "amount_remaining": 48000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkwOQ02009yBCHzuV?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkwOQ02009yBCHzuV/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "open",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": null
+        },
+        "previous_attributes": {
+          "effective_at": null,
+          "ending_balance": null,
+          "hosted_invoice_url": null,
+          "invoice_pdf": null,
+          "number": null,
+          "payment_intent": null,
+          "rendering": {
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null
+          }
+        }
+      },
+      "id": "evt_1Oqp97DEQaroqDjsQTky6lHb",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "0984dd6c-6d8e-4cd6-b2b3-872860807037"
+      },
+      "type": "invoice.updated"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "amount_capturable": 0,
+          "amount_details": {
+            "tip": {}
+          },
+          "amount_received": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "automatic_payment_methods": null,
+          "canceled_at": null,
+          "cancellation_reason": null,
+          "capture_method": "automatic",
+          "charges": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
+          },
+          "client_secret": "pi_NORMALIZED00000000000001_secret_1WCS91Fgcs94XHz13VDhYFEPM",
+          "confirmation_method": "automatic",
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "id": "pi_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "last_payment_error": null,
+          "latest_charge": null,
+          "livemode": false,
+          "metadata": {},
+          "next_action": null,
+          "object": "payment_intent",
+          "on_behalf_of": null,
+          "payment_method": null,
+          "payment_method_configuration_details": null,
+          "payment_method_options": {
+            "card": {
+              "installments": null,
+              "mandate_options": null,
+              "network": null,
+              "request_three_d_secure": "automatic"
+            },
+            "cashapp": {}
+          },
+          "payment_method_types": [
+            "card",
+            "cashapp"
+          ],
+          "processing": null,
+          "receipt_email": "hamlet@zulip.com",
+          "review": null,
+          "setup_future_usage": null,
+          "shipping": null,
+          "source": null,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "statement_descriptor_suffix": null,
+          "status": "requires_payment_method",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3Oqp96DEQaroqDjs02nLIDlP",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0003",
+        "idempotency_key": "0984dd6c-6d8e-4cd6-b2b3-872860807037"
+      },
+      "type": "payment_intent.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 48000,
+          "amount_paid": 0,
+          "amount_remaining": 48000,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 0,
+          "attempted": false,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": null,
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": null,
+          "ending_balance": null,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": null,
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": null,
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 48000,
+                "amount_excluding_tax": 48000,
+                "currency": "usd",
+                "description": "Zulip Cloud Standard",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 8000,
+                  "unit_amount_decimal": "8000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 6,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "8000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "1",
+            "license_management": "automatic",
+            "licenses": "6",
+            "plan_tier": "1",
+            "user_id": "10"
+          },
+          "next_payment_attempt": null,
+          "number": null,
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": false,
+          "paid_out_of_band": false,
+          "payment_intent": null,
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "auto"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Cloud Standard",
+          "status": "draft",
+          "status_transitions": {
+            "finalized_at": null,
+            "marked_uncollectible_at": null,
+            "paid_at": null,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 48000,
+          "subtotal_excluding_tax": 48000,
+          "tax": null,
+          "test_clock": null,
+          "total": 48000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 48000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": null
+        }
+      },
+      "id": "evt_1Oqp96DEQaroqDjsLJNAzzQ2",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0004",
+        "idempotency_key": "cb173b23-df67-4985-9178-f95413a1c1a1"
+      },
+      "type": "invoice.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 48000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "date": 1000000000,
+          "description": "Zulip Cloud Standard",
+          "discountable": false,
+          "discounts": [],
+          "id": "ii_NORMALIZED00000000000001",
+          "invoice": null,
+          "livemode": false,
+          "metadata": {},
+          "object": "invoiceitem",
+          "period": {
+            "end": 1000000000,
+            "start": 1000000000
+          },
+          "plan": null,
+          "price": {
+            "active": false,
+            "billing_scheme": "per_unit",
+            "created": 1000000000,
+            "currency": "usd",
+            "custom_unit_amount": null,
+            "id": "price_NORMALIZED00000000000001",
+            "livemode": false,
+            "lookup_key": null,
+            "metadata": {},
+            "nickname": null,
+            "object": "price",
+            "product": "prod_NORMALIZED0001",
+            "recurring": null,
+            "tax_behavior": "unspecified",
+            "tiers_mode": null,
+            "transform_quantity": null,
+            "type": "one_time",
+            "unit_amount": 8000,
+            "unit_amount_decimal": "8000"
+          },
+          "proration": false,
+          "quantity": 6,
+          "subscription": null,
+          "tax_rates": [],
+          "test_clock": null,
+          "unit_amount": 8000,
+          "unit_amount_decimal": "8000"
+        }
+      },
+      "id": "evt_1Oqp95DEQaroqDjscJsG9641",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "c3f7a08b-cebd-43c4-bce9-257dcf998bf9"
+      },
+      "type": "invoiceitem.created"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "address": null,
+          "balance": 0,
+          "created": 1000000000,
+          "currency": "usd",
+          "default_currency": "usd",
+          "default_source": null,
+          "delinquent": false,
+          "description": "zulip (Zulip Dev)",
+          "discount": null,
+          "email": "hamlet@zulip.com",
+          "id": "cus_NORMALIZED0001",
+          "invoice_prefix": "NORMA01",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "object": "customer",
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        },
+        "previous_attributes": {
+          "currency": null,
+          "default_currency": null
+        }
+      },
+      "id": "evt_1Oqp95DEQaroqDjsTDht6J9Y",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0005",
+        "idempotency_key": "c3f7a08b-cebd-43c4-bce9-257dcf998bf9"
+      },
+      "type": "customer.updated"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.3.json
index 5aaa388e97..c09939a86b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.3.json
@@ -1,196 +1,5 @@
 {
   "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
-          "amount_capturable": 0,
-          "amount_details": {
-            "tip": {}
-          },
-          "amount_received": 48000,
-          "application": null,
-          "application_fee_amount": null,
-          "automatic_payment_methods": null,
-          "canceled_at": null,
-          "cancellation_reason": null,
-          "capture_method": "automatic",
-          "charges": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_captured": 48000,
-                "amount_refunded": 0,
-                "application": null,
-                "application_fee": null,
-                "application_fee_amount": null,
-                "balance_transaction": "txn_NORMALIZED00000000000001",
-                "billing_details": {
-                  "address": {
-                    "city": null,
-                    "country": null,
-                    "line1": null,
-                    "line2": null,
-                    "postal_code": null,
-                    "state": null
-                  },
-                  "email": null,
-                  "name": null,
-                  "phone": null
-                },
-                "calculated_statement_descriptor": "ZULIP CLOUD STANDARD",
-                "captured": true,
-                "created": 1000000000,
-                "currency": "usd",
-                "customer": "cus_NORMALIZED0001",
-                "description": "Payment for Invoice",
-                "destination": null,
-                "dispute": null,
-                "disputed": false,
-                "failure_balance_transaction": null,
-                "failure_code": null,
-                "failure_message": null,
-                "fraud_details": {},
-                "id": "ch_NORMALIZED00000000000002",
-                "invoice": "in_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "charge",
-                "on_behalf_of": null,
-                "order": null,
-                "outcome": {
-                  "network_status": "approved_by_network",
-                  "reason": null,
-                  "risk_level": "normal",
-                  "risk_score": 0,
-                  "seller_message": "Payment complete.",
-                  "type": "authorized"
-                },
-                "paid": true,
-                "payment_intent": "pi_NORMALIZED00000000000002",
-                "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-                "payment_method_details": {
-                  "card": {
-                    "amount_authorized": 48000,
-                    "brand": "visa",
-                    "checks": {
-                      "address_line1_check": null,
-                      "address_postal_code_check": null,
-                      "cvc_check": "pass"
-                    },
-                    "country": "US",
-                    "exp_month": 2,
-                    "exp_year": 2025,
-                    "extended_authorization": {
-                      "status": "disabled"
-                    },
-                    "fingerprint": "NORMALIZED000001",
-                    "funding": "credit",
-                    "incremental_authorization": {
-                      "status": "unavailable"
-                    },
-                    "installments": null,
-                    "last4": "4242",
-                    "mandate": null,
-                    "multicapture": {
-                      "status": "unavailable"
-                    },
-                    "network": "visa",
-                    "network_token": {
-                      "used": false
-                    },
-                    "overcapture": {
-                      "maximum_amount_capturable": 48000,
-                      "status": "unavailable"
-                    },
-                    "three_d_secure": null,
-                    "wallet": null
-                  },
-                  "type": "card"
-                },
-                "radar_options": {},
-                "receipt_email": "hamlet@zulip.com",
-                "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJPlmK4GMgbnrPVJ1_Q6LBZ5Rw1M7CR75lyQ2nCguEwc7Jwh4CIKzlDZSws3k2gj0Nt-ovi94DAmg7lW?s=ap",
-                "refunded": false,
-                "refunds": {
-                  "data": [],
-                  "has_more": false,
-                  "object": "list",
-                  "total_count": 0,
-                  "url": "/v1/charges/ch_NORMALIZED00000000000002/refunds"
-                },
-                "review": null,
-                "shipping": null,
-                "source": null,
-                "source_transfer": null,
-                "statement_descriptor": "Zulip Cloud Standard",
-                "statement_descriptor_suffix": null,
-                "status": "succeeded",
-                "transfer_data": null,
-                "transfer_group": null
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
-          },
-          "client_secret": "pi_NORMALIZED00000000000002_secret_r9MqQIHw0FgWT989cYbXBmKar",
-          "confirmation_method": "automatic",
-          "created": 1000000000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000002",
-          "invoice": "in_NORMALIZED00000000000002",
-          "last_payment_error": null,
-          "latest_charge": "ch_NORMALIZED00000000000002",
-          "livemode": false,
-          "metadata": {},
-          "next_action": null,
-          "object": "payment_intent",
-          "on_behalf_of": null,
-          "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
-          "payment_method_configuration_details": null,
-          "payment_method_options": {
-            "card": {
-              "installments": null,
-              "mandate_options": null,
-              "network": null,
-              "request_three_d_secure": "automatic"
-            },
-            "cashapp": {}
-          },
-          "payment_method_types": [
-            "card",
-            "cashapp"
-          ],
-          "processing": null,
-          "receipt_email": "hamlet@zulip.com",
-          "review": null,
-          "setup_future_usage": null,
-          "shipping": null,
-          "source": null,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "statement_descriptor_suffix": null,
-          "status": "succeeded",
-          "transfer_data": null,
-          "transfer_group": null
-        }
-      },
-      "id": "evt_3OhuncDEQaroqDjs1U25K8Yd",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 1,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
-      },
-      "type": "payment_intent.succeeded"
-    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -200,13 +9,13 @@
           "account_name": "Kandra Labs, Inc.",
           "account_tax_ids": null,
           "amount_due": 48000,
-          "amount_paid": 0,
-          "amount_remaining": 48000,
+          "amount_paid": 48000,
+          "amount_remaining": 0,
           "amount_shipping": 0,
           "application": null,
           "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
+          "attempt_count": 1,
+          "attempted": true,
           "auto_advance": false,
           "automatic_tax": {
             "enabled": false,
@@ -214,7 +23,7 @@
             "status": null
           },
           "billing_reason": "manual",
-          "charge": null,
+          "charge": "ch_NORMALIZED00000000000001",
           "collection_method": "charge_automatically",
           "created": 1000000000,
           "currency": "usd",
@@ -238,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM/pdf?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -256,8 +65,9 @@
                 "discount_amounts": [],
                 "discountable": false,
                 "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
                 "object": "line_item",
@@ -302,7 +112,7 @@
             "has_more": false,
             "object": "list",
             "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
           },
           "livemode": false,
           "metadata": {
@@ -310,15 +120,15 @@
             "license_management": "automatic",
             "licenses": "6",
             "plan_tier": "1",
-            "user_id": "12"
+            "user_id": "10"
           },
           "next_payment_attempt": null,
           "number": "NORMALI-0002",
           "object": "invoice",
           "on_behalf_of": null,
-          "paid": false,
+          "paid": true,
           "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
+          "payment_intent": "pi_NORMALIZED00000000000001",
           "payment_settings": {
             "default_mandate": null,
             "payment_method_options": null,
@@ -341,11 +151,11 @@
           "shipping_details": null,
           "starting_balance": 0,
           "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
+          "status": "paid",
           "status_transitions": {
             "finalized_at": 1000000000,
             "marked_uncollectible_at": null,
-            "paid_at": null,
+            "paid_at": 1000000000,
             "voided_at": null
           },
           "subscription": null,
@@ -361,540 +171,18 @@
           "total_excluding_tax": 48000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhundDEQaroqDjsSovPuEvL",
+      "id": "evt_1Oqp99DEQaroqDjsoBXx1SYk",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
-        "id": "req_NORMALIZED0004",
-        "idempotency_key": "9a484d37-f817-4aa6-834c-b7114ca823a4"
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "54eb13e4-1d55-4a0e-96ef-344481a41f55"
       },
-      "type": "invoice.finalized"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njg50200YGYmHxNM/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "open",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        },
-        "previous_attributes": {
-          "effective_at": null,
-          "ending_balance": null,
-          "hosted_invoice_url": null,
-          "invoice_pdf": null,
-          "number": null,
-          "payment_intent": null,
-          "rendering": {
-            "pdf": {
-              "page_size": "auto"
-            }
-          },
-          "status": "draft",
-          "status_transitions": {
-            "finalized_at": null
-          }
-        }
-      },
-      "id": "evt_1OhundDEQaroqDjsYg3moveF",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0004",
-        "idempotency_key": "9a484d37-f817-4aa6-834c-b7114ca823a4"
-      },
-      "type": "invoice.updated"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
-          "amount_capturable": 0,
-          "amount_details": {
-            "tip": {}
-          },
-          "amount_received": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "automatic_payment_methods": null,
-          "canceled_at": null,
-          "cancellation_reason": null,
-          "capture_method": "automatic",
-          "charges": {
-            "data": [],
-            "has_more": false,
-            "object": "list",
-            "total_count": 0,
-            "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000002"
-          },
-          "client_secret": "pi_NORMALIZED00000000000002_secret_r9MqQIHw0FgWT989cYbXBmKar",
-          "confirmation_method": "automatic",
-          "created": 1000000000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "description": "Payment for Invoice",
-          "id": "pi_NORMALIZED00000000000002",
-          "invoice": "in_NORMALIZED00000000000002",
-          "last_payment_error": null,
-          "latest_charge": null,
-          "livemode": false,
-          "metadata": {},
-          "next_action": null,
-          "object": "payment_intent",
-          "on_behalf_of": null,
-          "payment_method": null,
-          "payment_method_configuration_details": null,
-          "payment_method_options": {
-            "card": {
-              "installments": null,
-              "mandate_options": null,
-              "network": null,
-              "request_three_d_secure": "automatic"
-            },
-            "cashapp": {}
-          },
-          "payment_method_types": [
-            "card",
-            "cashapp"
-          ],
-          "processing": null,
-          "receipt_email": "hamlet@zulip.com",
-          "review": null,
-          "setup_future_usage": null,
-          "shipping": null,
-          "source": null,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "statement_descriptor_suffix": null,
-          "status": "requires_payment_method",
-          "transfer_data": null,
-          "transfer_group": null
-        }
-      },
-      "id": "evt_3OhuncDEQaroqDjs15ikDUSk",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0004",
-        "idempotency_key": "9a484d37-f817-4aa6-834c-b7114ca823a4"
-      },
-      "type": "payment_intent.created"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 0,
-          "attempted": false,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": null,
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": null,
-          "ending_balance": null,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": null,
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": null,
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": null,
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": false,
-          "paid_out_of_band": false,
-          "payment_intent": null,
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "auto"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "draft",
-          "status_transitions": {
-            "finalized_at": null,
-            "marked_uncollectible_at": null,
-            "paid_at": null,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhuncDEQaroqDjssoOWUs9g",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0005",
-        "idempotency_key": "fafeeb74-3747-43b0-88c7-b41b4bc0c33c"
-      },
-      "type": "invoice.created"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "amount": 48000,
-          "currency": "usd",
-          "customer": "cus_NORMALIZED0001",
-          "date": 1000000000,
-          "description": "Zulip Cloud Standard",
-          "discountable": false,
-          "discounts": [],
-          "id": "ii_NORMALIZED00000000000002",
-          "invoice": null,
-          "livemode": false,
-          "metadata": {},
-          "object": "invoiceitem",
-          "period": {
-            "end": 1000000000,
-            "start": 1000000000
-          },
-          "plan": null,
-          "price": {
-            "active": false,
-            "billing_scheme": "per_unit",
-            "created": 1000000000,
-            "currency": "usd",
-            "custom_unit_amount": null,
-            "id": "price_NORMALIZED00000000000001",
-            "livemode": false,
-            "lookup_key": null,
-            "metadata": {},
-            "nickname": null,
-            "object": "price",
-            "product": "prod_NORMALIZED0001",
-            "recurring": null,
-            "tax_behavior": "unspecified",
-            "tiers_mode": null,
-            "transform_quantity": null,
-            "type": "one_time",
-            "unit_amount": 8000,
-            "unit_amount_decimal": "8000"
-          },
-          "proration": false,
-          "quantity": 6,
-          "subscription": null,
-          "tax_rates": [],
-          "test_clock": null,
-          "unit_amount": 8000,
-          "unit_amount_decimal": "8000"
-        }
-      },
-      "id": "evt_1OhunbDEQaroqDjsHwMsI9fS",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0006",
-        "idempotency_key": "ada964c5-6556-4772-bcc9-e4ac7f97cc83"
-      },
-      "type": "invoiceitem.created"
+      "type": "invoice.payment_succeeded"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.4.json
index 696e81e8ec..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.4.json
@@ -1,567 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000002",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhunfDEQaroqDjsCLTcZsHk",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 2,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
-      },
-      "type": "invoice.payment_succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000002",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1OhunfDEQaroqDjs471hQ3ZI",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
-      },
-      "type": "invoice.paid"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 48000,
-          "amount_paid": 48000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000002",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn?s=ap",
-          "id": "in_NORMALIZED00000000000002",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsQXJzVENiU1VZd3l5OEJha3VWMVJPOEZ0WFFmLDk4MDI4Njkx0200BmJnSiOn/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 48000,
-                "amount_excluding_tax": 48000,
-                "currency": "usd",
-                "description": "Zulip Cloud Standard",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 8000,
-                  "unit_amount_decimal": "8000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 6,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "8000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "1",
-            "license_management": "automatic",
-            "licenses": "6",
-            "plan_tier": "1",
-            "user_id": "12"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000002",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Cloud Standard",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 48000,
-          "subtotal_excluding_tax": 48000,
-          "tax": null,
-          "test_clock": null,
-          "total": 48000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 48000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        },
-        "previous_attributes": {
-          "amount_paid": 0,
-          "amount_remaining": 48000,
-          "attempt_count": 0,
-          "attempted": false,
-          "charge": null,
-          "paid": false,
-          "status": "open",
-          "status_transitions": {
-            "paid_at": null
-          }
-        }
-      },
-      "id": "evt_1OhunfDEQaroqDjsKZ8IjMJ5",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0003",
-        "idempotency_key": "65e26020-005b-4639-9d5d-16aeddfd3f93"
-      },
-      "type": "invoice.updated"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.9.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.9.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.9.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.1.json
index f4f30938d0..caa6a772e8 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.1.json
index 1baa7639ee..095e50bd46 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njgz02000IZ5m7iO?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkwOQ02009yBCHzuV?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njgz02000IZ5m7iO/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkwOQ02009yBCHzuV/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -116,7 +117,7 @@
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0001",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.list.2.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.list.2.json
index e4fd86277c..5036540e6f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.list.2.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg20200CMPBIoov/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
@@ -118,7 +119,7 @@
         "user_id": "10"
       },
       "next_payment_attempt": null,
-      "number": "NORMALI-0001",
+      "number": "NORMALI-0002",
       "object": "invoice",
       "on_behalf_of": null,
       "paid": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.1.json
index c806331fd6..01f5f19a83 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg10200EiA3PXAA?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsV0tQZktTYUUwa1FaUExqYVJ2YURtRXhXdHhZLDk4MDI4Njg10200EiA3PXAA/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZ0JXODR1eVhMclRweVc1Qk9CanlDMGd5ZEVndGVBLDEwMDE1MTkxMQ0200CjARjGYg/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -116,7 +117,7 @@
     "user_id": "10"
   },
   "next_payment_attempt": null,
-  "number": "NORMALI-0001",
+  "number": "NORMALI-0002",
   "object": "invoice",
   "on_behalf_of": null,
   "paid": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.create.1.json
index a98870b07f..f8acd52d2e 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhunTDEQaroqDjsX0JIylyA_secret_PWykneGloQw5Hg6vSDNKrVKSGkc1gbS",
+  "client_secret": "seti_1Oqp91DEQaroqDjszvOANjV0_secret_PgBWgVJOhW1y3eJ1LvLpgVPyJqCwuF7",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhunTDEQaroqDjsX0JIylyA",
+  "id": "seti_1Oqp91DEQaroqDjszvOANjV0",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhunTDEQaroqDjsPu6U7FNQ",
+  "latest_attempt": "setatt_1Oqp91DEQaroqDjs43kzIYqZ",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+  "payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.list.1.json
index c2c3864436..5c20e4b0e7 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhunSDEQaroqDjsRPjvPIUp_secret_PWykh139qz6mApK7EBqRoFRMBB2M9Bm",
+      "client_secret": "seti_1Oqp8zDEQaroqDjsWPOoaefS_secret_PgBWVdlhKCn7py9skeIVo8zueAc8Xt1",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhunSDEQaroqDjsRPjvPIUp",
+      "id": "seti_1Oqp8zDEQaroqDjsWPOoaefS",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.retrieve.1.json
index a98870b07f..f8acd52d2e 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhunTDEQaroqDjsX0JIylyA_secret_PWykneGloQw5Hg6vSDNKrVKSGkc1gbS",
+  "client_secret": "seti_1Oqp91DEQaroqDjszvOANjV0_secret_PgBWgVJOhW1y3eJ1LvLpgVPyJqCwuF7",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhunTDEQaroqDjsX0JIylyA",
+  "id": "seti_1Oqp91DEQaroqDjszvOANjV0",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhunTDEQaroqDjsPu6U7FNQ",
+  "latest_attempt": "setatt_1Oqp91DEQaroqDjs43kzIYqZ",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhunTDEQaroqDjsQwYz8PsQ",
+  "payment_method": "pm_1Oqp91DEQaroqDjs4MeFpD0I",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.create.1.json
index e39e9ee302..78776ccd4f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.create.1.json
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02l6eHSDUCRbRt75dI7WapxPtfaQuApfJEmcdI5houyfI4Tk",
+  "id": "cs_test_NORMALIZED02SPkqveUFe0LbuxuL6uUCqwORQrp5nAIZRlEf6hnEm9aCQE",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhunSDEQaroqDjsRPjvPIUp",
+  "setup_intent": "seti_1Oqp8zDEQaroqDjsWPOoaefS",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02l6eHSDUCRbRt75dI7WapxPtfaQuApfJEmcdI5houyfI4Tk#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02SPkqveUFe0LbuxuL6uUCqwORQrp5nAIZRlEf6hnEm9aCQE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.list.1.json
index 168f40302a..023d22475b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.list.1.json
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02l6eHSDUCRbRt75dI7WapxPtfaQuApfJEmcdI5houyfI4Tk",
+      "id": "cs_test_NORMALIZED02SPkqveUFe0LbuxuL6uUCqwORQrp5nAIZRlEf6hnEm9aCQE",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhunSDEQaroqDjsRPjvPIUp",
+      "setup_intent": "seti_1Oqp8zDEQaroqDjsWPOoaefS",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02l6eHSDUCRbRt75dI7WapxPtfaQuApfJEmcdI5houyfI4Tk#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02SPkqveUFe0LbuxuL6uUCqwORQrp5nAIZRlEf6hnEm9aCQE#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.modify.1.json
index ad6165e69f..520522a2ca 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhupNDEQaroqDjsCk7saPLa",
+    "default_payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.1.json
index 9d06cdab1b..7c082363bb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupNDEQaroqDjsCk7saPLa",
+      "id": "pm_1OqSqODEQaroqDjs5Ralywgp",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.2.json
index 9d06cdab1b..7c082363bb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupNDEQaroqDjsCk7saPLa",
+      "id": "pm_1OqSqODEQaroqDjs5Ralywgp",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.3.json
index 9d06cdab1b..7c082363bb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupNDEQaroqDjsCk7saPLa",
+      "id": "pm_1OqSqODEQaroqDjs5Ralywgp",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.4.json
index 9d06cdab1b..7c082363bb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupNDEQaroqDjsCk7saPLa",
+      "id": "pm_1OqSqODEQaroqDjs5Ralywgp",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.5.json
index 2c9e0ddccc..951ea5da0f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.5.json
@@ -6,7 +6,7 @@
   "default_currency": "usd",
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupNDEQaroqDjsCk7saPLa",
+      "id": "pm_1OqSqODEQaroqDjs5Ralywgp",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 2,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.6.json
index 2c9e0ddccc..951ea5da0f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.6.json
@@ -6,7 +6,7 @@
   "default_currency": "usd",
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupNDEQaroqDjsCk7saPLa",
+      "id": "pm_1OqSqODEQaroqDjs5Ralywgp",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 2,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.1.json
index f9f3977911..c5e4b087eb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhupNDEQaroqDjsCk7saPLa",
+            "default_payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhupPDEQaroqDjsb0a2J8NT",
+      "id": "evt_1OqSqQDEQaroqDjskYsnFbsL",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "866d93d1-5310-4474-a73d-ff7b2def8959"
+        "idempotency_key": "46180320-94cc-4d2e-992f-346d8331548e"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.2.json
index 35e0d523c0..44e1254d59 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhupNDEQaroqDjsCk7saPLa",
+                "payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 1850,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKIXmmK4GMgbfqF1pjV06LBa6MjVhyo7SRjb08zjt-QuqA9GF2lUVqJZcCvDhqYtB-pxkDTKEf_ZEFmY8?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKIuTla8GMgYDI-70clk6LBaMZkXJXYoUmigSDPyRw11Jdaz4n-UqiQ1Ihjbqwqov-HbKFfKTlOXkRCaG?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_12itlMFVhDVSinfQQKpzRuMiG",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_hm9fVzlMbpZa1nLtwigfLCw9b",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhupNDEQaroqDjsCk7saPLa",
+          "payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhupTDEQaroqDjs1a90GCg6",
+      "id": "evt_3OqSqTDEQaroqDjs06K1v7pL",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "27f3ff65-2416-4311-a705-96427239b278"
+        "idempotency_key": "57b9f8fd-1c5c-498a-a058-67c1138d0dd5"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 1850,
+          "amount_captured": 1850,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 1850,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 1850,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKIuTla8GMga_2Bevnpc6LBb719hMond4XMn_65_Hoo-S3VTnBDnyLce5XLMM6lRqF6WT6z-r9QQejMSU?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSqTDEQaroqDjs07VRJAuT",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "57b9f8fd-1c5c-498a-a058-67c1138d0dd5"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA00200VprYWiwt?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Ng0200LzzJ4PlI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA00200VprYWiwt/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Ng0200LzzJ4PlI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -307,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -410,16 +540,16 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupUDEQaroqDjsYfHoimWh",
+      "id": "evt_1OqSqUDEQaroqDjsetQRZ0iu",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "cb689d53-b0e5-4892-86fc-545c17510c3e"
+        "idempotency_key": "3bc62a14-b271-43a2-9213-2e5fdd24f259"
       },
       "type": "invoice.finalized"
     },
@@ -470,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA00200VprYWiwt?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Ng0200LzzJ4PlI?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA00200VprYWiwt/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Ng0200LzzJ4PlI/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -489,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -539,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -642,7 +774,7 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -662,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OhupUDEQaroqDjsKnxS9Zq6",
+      "id": "evt_1OqSqUDEQaroqDjsBRdOANRJ",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "cb689d53-b0e5-4892-86fc-545c17510c3e"
+        "idempotency_key": "3bc62a14-b271-43a2-9213-2e5fdd24f259"
       },
       "type": "invoice.updated"
     },
@@ -696,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_12itlMFVhDVSinfQQKpzRuMiG",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_hm9fVzlMbpZa1nLtwigfLCw9b",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -739,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhupTDEQaroqDjs1xJghPfP",
+      "id": "evt_3OqSqTDEQaroqDjs0qzJcwAL",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "cb689d53-b0e5-4892-86fc-545c17510c3e"
+        "idempotency_key": "3bc62a14-b271-43a2-9213-2e5fdd24f259"
       },
       "type": "payment_intent.created"
     },
@@ -815,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -865,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -968,16 +1102,16 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupTDEQaroqDjsJRTf8Yi4",
+      "id": "evt_1OqSqTDEQaroqDjscpChd91i",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "4207be8d-0ac1-4aa4-81ab-3de32a36952d"
+        "idempotency_key": "3010de3a-be4e-4a4a-ba86-dbe32598c448"
       },
       "type": "invoice.created"
     },
@@ -1033,13 +1167,13 @@
           "unit_amount_decimal": "-2000"
         }
       },
-      "id": "evt_1OhupSDEQaroqDjss6LFqr5L",
+      "id": "evt_1OqSqSDEQaroqDjsZUANBm0p",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "2a9c0c29-7447-4b26-866e-cc9ab8b1c35f"
+        "idempotency_key": "02c8599f-97cb-4833-afa6-c303ecf8e5da"
       },
       "type": "invoiceitem.created"
     },
@@ -1095,13 +1229,13 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1OhupSDEQaroqDjsrsTHGCU3",
+      "id": "evt_1OqSqSDEQaroqDjsHUYrlYqd",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "badc03db-5549-4b3e-b8c4-0127789cf632"
+        "idempotency_key": "445d7d01-ec3f-4e2c-838a-b9e518ac3a55"
       },
       "type": "invoiceitem.created"
     },
@@ -1117,21 +1251,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhupNDEQaroqDjsCk7saPLa",
+            "default_payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1147,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhupSDEQaroqDjsZrKOXLG8",
+      "id": "evt_1OqSqSDEQaroqDjs0dUiN7VN",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "badc03db-5549-4b3e-b8c4-0127789cf632"
+        "idempotency_key": "445d7d01-ec3f-4e2c-838a-b9e518ac3a55"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.3.json
index 53a20ddf23..fb1c17b4be 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA20200nFGHdKmk?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4OA0200xcjmwAjB?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA20200nFGHdKmk/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4OA0200xcjmwAjB/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -219,16 +221,250 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupWDEQaroqDjscmPiVdI8",
+      "id": "evt_1OqSqWDEQaroqDjsJVp63W1w",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "27f3ff65-2416-4311-a705-96427239b278"
+        "idempotency_key": "57b9f8fd-1c5c-498a-a058-67c1138d0dd5"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 1850,
+          "amount_paid": 1850,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4OA0200xcjmwAjB?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4OA0200xcjmwAjB/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 3850,
+                "amount_excluding_tax": 3850,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 11,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "11",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 1850,
+          "subtotal_excluding_tax": 1850,
+          "tax": null,
+          "test_clock": null,
+          "total": 1850,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 1850,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqSqWDEQaroqDjs0YSz1if7",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "57b9f8fd-1c5c-498a-a058-67c1138d0dd5"
       },
       "type": "invoice.paid"
     },
@@ -279,9 +515,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA20200nFGHdKmk?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4OA0200xcjmwAjB?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA20200nFGHdKmk/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4OA0200xcjmwAjB/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +534,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +585,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -451,7 +689,7 @@
           "total_excluding_tax": 1850,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -466,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhupWDEQaroqDjsG4fgqK5f",
+      "id": "evt_1OqSqWDEQaroqDjsjZYYHkcI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "27f3ff65-2416-4311-a705-96427239b278"
+        "idempotency_key": "57b9f8fd-1c5c-498a-a058-67c1138d0dd5"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.4.json
index 68a716b11d..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.4.json
@@ -1,238 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 1850,
-          "amount_paid": 1850,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA20200nFGHdKmk?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA20200nFGHdKmk/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 3850,
-                "amount_excluding_tax": 3850,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 11,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "11",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 1850,
-          "subtotal_excluding_tax": 1850,
-          "tax": null,
-          "test_clock": null,
-          "total": 1850,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 1850,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhupWDEQaroqDjs1m9Q0C8Z",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "27f3ff65-2416-4311-a705-96427239b278"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.create.1.json
index ce7570d59a..9880df0479 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json
index 7cf3c9251b..94dd63c21b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODAz0200EoBVVCdN?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Ng0200LzzJ4PlI?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODAz0200EoBVVCdN/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Ng0200LzzJ4PlI/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.pay.1.json
index 42757482d8..546dfd4c6f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA10200oScDxEc7?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Nw0200SkVILD3w?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lublZQcWFDbXVNVnI5a0RRRmNiMDhkeDFBUkJ5LDk4MDI4ODA10200oScDxEc7/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UWWE0SHFuS1pudnJYSTl2RWk4aXRadUhHZTZPLDEwMDA2NjE4Nw0200SkVILD3w/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 1850,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.create.1.json
index a0c4c78eab..9a860edc5e 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupNDEQaroqDjswDdroBSn_secret_PWymbibbxiaXSWRgjV7Yxge1iAVjUd8",
+  "client_secret": "seti_1OqSqODEQaroqDjsZUTmWPMU_secret_PfoTSqGjf0ebwPhDTwJeBhEjigx8ZD5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupNDEQaroqDjswDdroBSn",
+  "id": "seti_1OqSqODEQaroqDjsZUTmWPMU",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupODEQaroqDjsHgtigdnx",
+  "latest_attempt": "setatt_1OqSqODEQaroqDjshzSi5hKj",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupNDEQaroqDjsCk7saPLa",
+  "payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.list.1.json
index 72c080926e..ca924ef5e2 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhupMDEQaroqDjskhAEv6kR_secret_PWymhrHz2jhXBeOT51j8Q2r59a6cuGf",
+      "client_secret": "seti_1OqSqNDEQaroqDjsYMKmjM0m_secret_PfoTJKzEVoe1lzVbJGRVhvBucLD4t6D",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhupMDEQaroqDjskhAEv6kR",
+      "id": "seti_1OqSqNDEQaroqDjsYMKmjM0m",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json
index a0c4c78eab..9a860edc5e 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupNDEQaroqDjswDdroBSn_secret_PWymbibbxiaXSWRgjV7Yxge1iAVjUd8",
+  "client_secret": "seti_1OqSqODEQaroqDjsZUTmWPMU_secret_PfoTSqGjf0ebwPhDTwJeBhEjigx8ZD5",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupNDEQaroqDjswDdroBSn",
+  "id": "seti_1OqSqODEQaroqDjsZUTmWPMU",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupODEQaroqDjsHgtigdnx",
+  "latest_attempt": "setatt_1OqSqODEQaroqDjshzSi5hKj",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupNDEQaroqDjsCk7saPLa",
+  "payment_method": "pm_1OqSqODEQaroqDjs5Ralywgp",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.create.1.json
index e0c91052b3..985996d14a 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02nXhwsUWmqRUI3gejXQNVO0NS8lFC8rhwKl6jKyyMhx8MBf",
+  "id": "cs_test_NORMALIZED02vzDAtCZ9GcZz4SoFLv4N5aB8L0YoCLEg3Q57afjznxDIlD",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "10",
+    "remote_realm_user_id": "11",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhupMDEQaroqDjskhAEv6kR",
+  "setup_intent": "seti_1OqSqNDEQaroqDjsYMKmjM0m",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02nXhwsUWmqRUI3gejXQNVO0NS8lFC8rhwKl6jKyyMhx8MBf#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vzDAtCZ9GcZz4SoFLv4N5aB8L0YoCLEg3Q57afjznxDIlD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.list.1.json
index 7efe18ce95..764fb9ddd7 100644
--- a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02nXhwsUWmqRUI3gejXQNVO0NS8lFC8rhwKl6jKyyMhx8MBf",
+      "id": "cs_test_NORMALIZED02vzDAtCZ9GcZz4SoFLv4N5aB8L0YoCLEg3Q57afjznxDIlD",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "10",
+        "remote_realm_user_id": "11",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhupMDEQaroqDjskhAEv6kR",
+      "setup_intent": "seti_1OqSqNDEQaroqDjsYMKmjM0m",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02nXhwsUWmqRUI3gejXQNVO0NS8lFC8rhwKl6jKyyMhx8MBf#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vzDAtCZ9GcZz4SoFLv4N5aB8L0YoCLEg3Q57afjznxDIlD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.modify.1.json
index 8e156ee6b3..2766a11846 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+    "default_payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json
index c7cf8cdc6b..e4c8e55c9b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+      "id": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json
index c7cf8cdc6b..e4c8e55c9b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+      "id": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json
index c7cf8cdc6b..e4c8e55c9b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+      "id": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json
index c7cf8cdc6b..e4c8e55c9b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+      "id": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json
index 6681e0ec40..b2b134744a 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+      "id": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.1.json
index 9f0d6b0a7d..67a2159154 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+            "default_payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhurlDEQaroqDjsxX6Y7vRZ",
+      "id": "evt_1OqSt9DEQaroqDjs6d1i0Xap",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "7c507b77-edf1-441f-bf56-3d2418bec9d4"
+        "idempotency_key": "f68dd21f-5b96-4506-8763-6235aa91a643"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.2.json
index 6c8bec00e1..e1a9a326f8 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+                "payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 10000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJfnmK4GMgZeb2f17Zs6LBZ4DInpzWUIUjM57Zj-LMZsur_oQBmps39mvQOSSj5ihIONwA9QR8_fOsDv?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLWUla8GMgbnF4UP7zI6LBZf2Fo3jV6FuIEqvrHYZrMnMUISr4AKUTTaCOt-A9SYOMcWV23Cmq1PYZAC?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_InreOawpwCOOxKyNxBla6Njwp",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_e5NhCDoA1dZnvDKJZhpC4qJAZ",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+          "payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuroDEQaroqDjs0FjpDFNu",
+      "id": "evt_3OqStDDEQaroqDjs0rUTyi7O",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "5986f831-bfde-41e1-ba49-140ab24b2c19"
+        "idempotency_key": "2ad81d7b-c38e-42de-804c-b50c424ffe10"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 10000,
+          "amount_captured": 10000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 10000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 10000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLWUla8GMgavHJVWU186LBYEJG-6Co4slW-0zn5EacNblZUft6xnGzxieCt2QFZDVimFQhjdxTrHU38M?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqStDDEQaroqDjs0zTcsWiT",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "2ad81d7b-c38e-42de-804c-b50c424ffe10"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTQ50200lFkbupxn?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1NQ0200c5KfSHg7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTQ50200lFkbupxn/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1NQ0200c5KfSHg7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -360,16 +489,16 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhurpDEQaroqDjsrysS10yK",
+      "id": "evt_1OqStDDEQaroqDjsptl2odWn",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "6f152fa0-a9fe-4b09-a552-e06320c00ed3"
+        "idempotency_key": "c0a17d15-11ce-431f-95fe-f607f1ed9349"
       },
       "type": "invoice.finalized"
     },
@@ -420,9 +549,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTQ50200lFkbupxn?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1NQ0200c5KfSHg7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTQ50200lFkbupxn/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1NQ0200c5KfSHg7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -439,6 +568,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -542,7 +672,7 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -562,13 +692,13 @@
           }
         }
       },
-      "id": "evt_1OhurpDEQaroqDjsVxDYqU7o",
+      "id": "evt_1OqStDDEQaroqDjsCwXmmfRr",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "6f152fa0-a9fe-4b09-a552-e06320c00ed3"
+        "idempotency_key": "c0a17d15-11ce-431f-95fe-f607f1ed9349"
       },
       "type": "invoice.updated"
     },
@@ -596,7 +726,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_InreOawpwCOOxKyNxBla6Njwp",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_e5NhCDoA1dZnvDKJZhpC4qJAZ",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -639,13 +769,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhuroDEQaroqDjs0W6NVSyl",
+      "id": "evt_3OqStDDEQaroqDjs01evAV0H",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "6f152fa0-a9fe-4b09-a552-e06320c00ed3"
+        "idempotency_key": "c0a17d15-11ce-431f-95fe-f607f1ed9349"
       },
       "type": "payment_intent.created"
     },
@@ -715,6 +845,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -818,16 +949,16 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuroDEQaroqDjsUvJrvmjM",
+      "id": "evt_1OqStCDEQaroqDjsM6Oz6viG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "185fcedb-6a31-4493-8b51-4c23ebcf4417"
+        "idempotency_key": "ae637774-7e0b-4408-94a2-dc9eb6912984"
       },
       "type": "invoice.created"
     },
@@ -883,13 +1014,13 @@
           "unit_amount_decimal": "10000"
         }
       },
-      "id": "evt_1OhurnDEQaroqDjsmdHYtSYP",
+      "id": "evt_1OqStCDEQaroqDjsMYsZ6uBh",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "c467650d-1aae-4800-9eff-2ac26bbe0c90"
+        "idempotency_key": "4925aba6-e580-4177-8a4e-a48cfafead32"
       },
       "type": "invoiceitem.created"
     },
@@ -912,7 +1043,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+            "default_payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
             "footer": null,
             "rendering_options": null
           },
@@ -935,13 +1066,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhurnDEQaroqDjsqRl7N9rw",
+      "id": "evt_1OqStCDEQaroqDjs6tvTTWe7",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "c467650d-1aae-4800-9eff-2ac26bbe0c90"
+        "idempotency_key": "4925aba6-e580-4177-8a4e-a48cfafead32"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.3.json
index ac737d51d1..ce3c2acfd2 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUx0200n9qw9ef9?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Nw0200j8nVCdsB?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUx0200n9qw9ef9/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Nw0200j8nVCdsB/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -169,16 +170,199 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhurrDEQaroqDjsdznY2TmN",
+      "id": "evt_1OqStFDEQaroqDjs3SDE9wrY",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "5986f831-bfde-41e1-ba49-140ab24b2c19"
+        "idempotency_key": "2ad81d7b-c38e-42de-804c-b50c424ffe10"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 10000,
+          "amount_paid": 10000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Nw0200j8nVCdsB?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Nw0200j8nVCdsB/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 10000,
+                "amount_excluding_tax": 10000,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 10000,
+                  "unit_amount_decimal": "10000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "10000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 10000,
+          "subtotal_excluding_tax": 10000,
+          "tax": null,
+          "test_clock": null,
+          "total": 10000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 10000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqStFDEQaroqDjsnhqKkMM3",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "2ad81d7b-c38e-42de-804c-b50c424ffe10"
       },
       "type": "invoice.paid"
     },
@@ -229,9 +413,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUx0200n9qw9ef9?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Nw0200j8nVCdsB?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUx0200n9qw9ef9/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Nw0200j8nVCdsB/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -248,6 +432,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -351,7 +536,7 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -366,13 +551,13 @@
           }
         }
       },
-      "id": "evt_1OhurrDEQaroqDjsUT8xH8PM",
+      "id": "evt_1OqStFDEQaroqDjsKqL6U5F8",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "5986f831-bfde-41e1-ba49-140ab24b2c19"
+        "idempotency_key": "2ad81d7b-c38e-42de-804c-b50c424ffe10"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.4.json
index ec58653336..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.4.json
@@ -1,188 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 10000,
-          "amount_paid": 10000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUx0200n9qw9ef9?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUx0200n9qw9ef9/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 10000,
-                "amount_excluding_tax": 10000,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 10000,
-                  "unit_amount_decimal": "10000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "10000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 10000,
-          "subtotal_excluding_tax": 10000,
-          "tax": null,
-          "test_clock": null,
-          "total": 10000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 10000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1OhurrDEQaroqDjsiNirzNUP",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "5986f831-bfde-41e1-ba49-140ab24b2c19"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.create.1.json
index bcd5034bba..c98c8f7727 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -163,5 +164,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json
index 130b3ffa07..1708e7ff80 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTQ40200VGB6JBvM?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1NQ0200c5KfSHg7?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTQ40200VGB6JBvM/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1NQ0200c5KfSHg7/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -163,5 +164,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json
index d0de5c2b04..bb79926534 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUw0200ewNXQsUw?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Ng0200frHCG83R?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwSDhCcHN3aVM0Wm9kYmNuRmNvNjlyYXloYVdVLDk4MDI4OTUw0200ewNXQsUw/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XQ1NMS0FUMUpkblROUGxFMUIxZHFyR0hFa1BVLDEwMDA2NjM1Ng0200frHCG83R/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -163,5 +164,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json
index 1fecd43a97..47104e769d 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurjDEQaroqDjsQapCYTTV_secret_PWypaGyeFEpMTWvUqiPis1HXpmL5JzD",
+  "client_secret": "seti_1OqSt8DEQaroqDjsKArNITRt_secret_PfoWt6rTydvCDzkeabP9yUO8bOGjMuT",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurjDEQaroqDjsQapCYTTV",
+  "id": "seti_1OqSt8DEQaroqDjsKArNITRt",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurjDEQaroqDjsTGmnKXLR",
+  "latest_attempt": "setatt_1OqSt8DEQaroqDjs1iyXX9an",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+  "payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json
index 0ec7aa303f..17713c6211 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhuriDEQaroqDjsKtZ2XgBR_secret_PWypA0fa2qEU4jDPgwMmHGQY6Ax2lu5",
+      "client_secret": "seti_1OqSt7DEQaroqDjs8dsG7Ccd_secret_PfoWKUrfKuQfgEqfwajqacEikhuMzQO",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhuriDEQaroqDjsKtZ2XgBR",
+      "id": "seti_1OqSt7DEQaroqDjs8dsG7Ccd",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json
index 1fecd43a97..47104e769d 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurjDEQaroqDjsQapCYTTV_secret_PWypaGyeFEpMTWvUqiPis1HXpmL5JzD",
+  "client_secret": "seti_1OqSt8DEQaroqDjsKArNITRt_secret_PfoWt6rTydvCDzkeabP9yUO8bOGjMuT",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurjDEQaroqDjsQapCYTTV",
+  "id": "seti_1OqSt8DEQaroqDjsKArNITRt",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurjDEQaroqDjsTGmnKXLR",
+  "latest_attempt": "setatt_1OqSt8DEQaroqDjs1iyXX9an",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurjDEQaroqDjsn6GaVPc7",
+  "payment_method": "pm_1OqSt8DEQaroqDjsmkZTtd7d",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json
index 66211903ff..e292328676 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02x3Ql3CcPhOjYpTWO22b8eCXYjNgnGYV7dkZ6a0FVcAdNYB",
+  "id": "cs_test_NORMALIZED02wUaIY42AiRAK3NrwUpGqnclqglodeISpeVmd47ovxEdHfI",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "12",
+    "remote_server_user_id": "14",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhuriDEQaroqDjsKtZ2XgBR",
+  "setup_intent": "seti_1OqSt7DEQaroqDjs8dsG7Ccd",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02x3Ql3CcPhOjYpTWO22b8eCXYjNgnGYV7dkZ6a0FVcAdNYB#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02wUaIY42AiRAK3NrwUpGqnclqglodeISpeVmd47ovxEdHfI#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json
index a3ceebf3f8..1a8555c645 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02x3Ql3CcPhOjYpTWO22b8eCXYjNgnGYV7dkZ6a0FVcAdNYB",
+      "id": "cs_test_NORMALIZED02wUaIY42AiRAK3NrwUpGqnclqglodeISpeVmd47ovxEdHfI",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "12",
+        "remote_server_user_id": "14",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhuriDEQaroqDjsKtZ2XgBR",
+      "setup_intent": "seti_1OqSt7DEQaroqDjs8dsG7Ccd",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02x3Ql3CcPhOjYpTWO22b8eCXYjNgnGYV7dkZ6a0FVcAdNYB#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02wUaIY42AiRAK3NrwUpGqnclqglodeISpeVmd47ovxEdHfI#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.modify.1.json
index a7dfddd25e..96ca179cb4 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+    "default_payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.1.json
index dcbc9962eb..a3e8ce3280 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+      "id": "pm_1OqStKDEQaroqDjs9VAoMbO7",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.2.json
index dcbc9962eb..a3e8ce3280 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+      "id": "pm_1OqStKDEQaroqDjs9VAoMbO7",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.3.json
index dcbc9962eb..a3e8ce3280 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+      "id": "pm_1OqStKDEQaroqDjs9VAoMbO7",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.4.json
index dcbc9962eb..a3e8ce3280 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+      "id": "pm_1OqStKDEQaroqDjs9VAoMbO7",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.5.json
index 947ec11e2a..74e481802d 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+      "id": "pm_1OqStKDEQaroqDjs9VAoMbO7",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.6.json
index 947ec11e2a..74e481802d 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+      "id": "pm_1OqStKDEQaroqDjs9VAoMbO7",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.1.json
index 12225a5472..3e1f968407 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+            "default_payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhuryDEQaroqDjsIMOe3dfA",
+      "id": "evt_1OqStMDEQaroqDjs4FG9bVZD",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "f95026a3-c76b-4d85-a26d-c0022d2d201e"
+        "idempotency_key": "90385117-5b25-406d-9767-8ecdd56b70b5"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.2.json
index 7fedff667b..f2d6427c81 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+                "payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 4300,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKTnmK4GMgaY0OZ79W46LBZGM7c6QzF4AyJK7CH9U62Glr2suau4gUKkBtNSNwwpb3kHGvApJJebdNi5?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMKUla8GMgY7Yo4Mi2U6LBZk2dCe3AN1Lddu9cjZ5FBsNC32USNb4E8ro6ZJDrO4cDqwHRXsEOaOuh9l?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_LPjWmqclX6YkjU2a5FY4CCzmv",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_jMG7wEB3Fkrvv7nmaarXLYlqR",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+          "payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +181,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohus2DEQaroqDjs19oBMlTE",
+      "id": "evt_3OqStPDEQaroqDjs0vRMXprn",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "3386ebde-341b-40f5-8286-7f45da300676"
+        "idempotency_key": "5d137dec-e1ea-4a80-87df-afe3cf590267"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 4300,
+          "amount_captured": 4300,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 4300,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 4300,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKMKUla8GMgYZf5sc9fw6LBY1v1L1p5TG_XnSy3sYCltLmsIdZiMdwPRRzdikIkr10KEGg3txkz2_2IIR?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqStPDEQaroqDjs02b89yM2",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "5d137dec-e1ea-4a80-87df-afe3cf590267"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTYy0200viVh8E1n?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OA0200kjjciAvd?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTYy0200viVh8E1n/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OA0200kjjciAvd/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -307,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -410,16 +540,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohus2DEQaroqDjsO41Iv6zG",
+      "id": "evt_1OqStQDEQaroqDjs2SuoJIcE",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "ec82ab72-7a18-4e1d-b31f-c6dfec2c5c23"
+        "idempotency_key": "9ea19d48-e002-42ae-8bec-b95635133d7e"
       },
       "type": "invoice.finalized"
     },
@@ -470,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTYy0200viVh8E1n?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OA0200kjjciAvd?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTYy0200viVh8E1n/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OA0200kjjciAvd/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -489,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -539,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -642,7 +774,7 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -662,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1Ohus2DEQaroqDjsD1gLRCSU",
+      "id": "evt_1OqStQDEQaroqDjsBoHsIuxk",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "ec82ab72-7a18-4e1d-b31f-c6dfec2c5c23"
+        "idempotency_key": "9ea19d48-e002-42ae-8bec-b95635133d7e"
       },
       "type": "invoice.updated"
     },
@@ -696,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_LPjWmqclX6YkjU2a5FY4CCzmv",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_jMG7wEB3Fkrvv7nmaarXLYlqR",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -739,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohus2DEQaroqDjs1AYHt8Kg",
+      "id": "evt_3OqStPDEQaroqDjs00s5V6VG",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "ec82ab72-7a18-4e1d-b31f-c6dfec2c5c23"
+        "idempotency_key": "9ea19d48-e002-42ae-8bec-b95635133d7e"
       },
       "type": "payment_intent.created"
     },
@@ -815,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -865,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -968,16 +1102,16 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohus1DEQaroqDjsXUdfHpJ5",
+      "id": "evt_1OqStPDEQaroqDjswoGLTOg3",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "5c9edfc0-33d2-453b-a929-41a1efdf7b66"
+        "idempotency_key": "f6184982-bf4c-4009-936f-c86dd1520c5b"
       },
       "type": "invoice.created"
     },
@@ -1033,13 +1167,13 @@
           "unit_amount_decimal": "-2000"
         }
       },
-      "id": "evt_1Ohus1DEQaroqDjsfE7tVrPH",
+      "id": "evt_1OqStODEQaroqDjsZd58Lkrk",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "4165cac6-b4be-4442-a4c1-a672b9481fe8"
+        "idempotency_key": "2abd75a6-a0b4-4dc4-a4bf-0f8b88d7c52d"
       },
       "type": "invoiceitem.created"
     },
@@ -1095,13 +1229,13 @@
           "unit_amount_decimal": "350"
         }
       },
-      "id": "evt_1Ohus0DEQaroqDjsW9zeueJc",
+      "id": "evt_1OqStODEQaroqDjsQWj5g7rv",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "15a73b65-23eb-4617-b812-7095c381c008"
+        "idempotency_key": "56cf2191-dc2e-40e9-923f-846cce78f17d"
       },
       "type": "invoiceitem.created"
     },
@@ -1124,7 +1258,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+            "default_payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
             "footer": null,
             "rendering_options": null
           },
@@ -1147,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1Ohus0DEQaroqDjsCeyfAArm",
+      "id": "evt_1OqStODEQaroqDjsIBtQ2wTV",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "15a73b65-23eb-4617-b812-7095c381c008"
+        "idempotency_key": "56cf2191-dc2e-40e9-923f-846cce78f17d"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.3.json
index 57db24c756..2844f3e426 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY00200p2WomJmg?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM3MA0200n8ZpfvQV?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY00200p2WomJmg/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM3MA0200n8ZpfvQV/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -219,7 +221,475 @@
           "total_excluding_tax": 4300,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqStSDEQaroqDjsjcesML5U",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "5d137dec-e1ea-4a80-87df-afe3cf590267"
+      },
+      "type": "invoice.payment_succeeded"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 4300,
+          "amount_paid": 4300,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM3MA0200n8ZpfvQV?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM3MA0200n8ZpfvQV/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 6300,
+                "amount_excluding_tax": 6300,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 18,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 4300,
+          "subtotal_excluding_tax": 4300,
+          "tax": null,
+          "test_clock": null,
+          "total": 4300,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 4300,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        }
+      },
+      "id": "evt_1OqStSDEQaroqDjsQDpufg1W",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "5d137dec-e1ea-4a80-87df-afe3cf590267"
+      },
+      "type": "invoice.paid"
+    },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 4300,
+          "amount_paid": 4300,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM3MA0200n8ZpfvQV?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM3MA0200n8ZpfvQV/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": -2000,
+                "amount_excluding_tax": -2000,
+                "currency": "usd",
+                "description": "$20.00/month new customer discount",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": -2000,
+                  "unit_amount_decimal": "-2000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "-2000"
+              },
+              {
+                "amount": 6300,
+                "amount_excluding_tax": 6300,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000002",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000002",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0002",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 350,
+                  "unit_amount_decimal": "350"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 18,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "350"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 2,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "18",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0002",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 4300,
+          "subtotal_excluding_tax": 4300,
+          "tax": null,
+          "test_clock": null,
+          "total": 4300,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 4300,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "amount_paid": 0,
@@ -234,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1Ohus5DEQaroqDjsJcDWf06D",
+      "id": "evt_1OqStSDEQaroqDjsFBtg9e8l",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "3386ebde-341b-40f5-8286-7f45da300676"
+        "idempotency_key": "5d137dec-e1ea-4a80-87df-afe3cf590267"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.4.json
index 9f3203bf51..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.4.json
@@ -1,470 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 4300,
-          "amount_paid": 4300,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY10200JQAfG5IQ?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY10200JQAfG5IQ/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 6300,
-                "amount_excluding_tax": 6300,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 18,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 4300,
-          "subtotal_excluding_tax": 4300,
-          "tax": null,
-          "test_clock": null,
-          "total": 4300,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 4300,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1Ohus5DEQaroqDjs6qzp7LAZ",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 1,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "3386ebde-341b-40f5-8286-7f45da300676"
-      },
-      "type": "invoice.payment_succeeded"
-    },
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 4300,
-          "amount_paid": 4300,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY10200JQAfG5IQ?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY10200JQAfG5IQ/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": -2000,
-                "amount_excluding_tax": -2000,
-                "currency": "usd",
-                "description": "$20.00/month new customer discount",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": -2000,
-                  "unit_amount_decimal": "-2000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "-2000"
-              },
-              {
-                "amount": 6300,
-                "amount_excluding_tax": 6300,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000002",
-                "invoice_item": "ii_NORMALIZED00000000000002",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000002",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0002",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 350,
-                  "unit_amount_decimal": "350"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 18,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "350"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 2,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "18",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 4300,
-          "subtotal_excluding_tax": 4300,
-          "tax": null,
-          "test_clock": null,
-          "total": 4300,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 4300,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": null
-        }
-      },
-      "id": "evt_1Ohus5DEQaroqDjsdXC3XHS4",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "3386ebde-341b-40f5-8286-7f45da300676"
-      },
-      "type": "invoice.paid"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.create.1.json
index 2ee818ce55..f2ec80f992 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json
index a70c429b12..84245d50b3 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTYy0200viVh8E1n?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OA0200kjjciAvd?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTYy0200viVh8E1n/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OA0200kjjciAvd/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.pay.1.json
index 8955b35465..da51e9c6d7 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY00200p2WomJmg?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OQ0200kHOmvQnl?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lwdmw1QmQyckpkMnk5QldVaHpWRm42ZWowNWdlLDk4MDI4OTY00200p2WomJmg/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9XUW9Fd1ZqdkR0VmxFNE03NGpUMmxWQVZMMU8zLDEwMDA2NjM2OQ0200kHOmvQnl/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 4300,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.create.1.json
index 1e7712cfaf..c9f5afe3cd 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurwDEQaroqDjs6SXrTQoD_secret_PWyp728qg42DmdyptHL7GKHdAOiPkpH",
+  "client_secret": "seti_1OqStKDEQaroqDjsViPOvE1v_secret_PfoWrQvzeGb6CeEGCOTwURNV5SbzqEh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurwDEQaroqDjs6SXrTQoD",
+  "id": "seti_1OqStKDEQaroqDjsViPOvE1v",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurwDEQaroqDjsbb5HXAJd",
+  "latest_attempt": "setatt_1OqStKDEQaroqDjsd8GDPuOB",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+  "payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.list.1.json
index 27a5c9bb56..dd911fd2cf 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhurvDEQaroqDjssQrW95XD_secret_PWypnzRiqwsALsg7ZyEnq8zre3lAUK6",
+      "client_secret": "seti_1OqStJDEQaroqDjs1Q2trIM6_secret_PfoWcfIUIPK6vbalPYnfd3l985563xk",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhurvDEQaroqDjssQrW95XD",
+      "id": "seti_1OqStJDEQaroqDjs1Q2trIM6",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json
index 1e7712cfaf..c9f5afe3cd 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhurwDEQaroqDjs6SXrTQoD_secret_PWyp728qg42DmdyptHL7GKHdAOiPkpH",
+  "client_secret": "seti_1OqStKDEQaroqDjsViPOvE1v_secret_PfoWrQvzeGb6CeEGCOTwURNV5SbzqEh",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhurwDEQaroqDjs6SXrTQoD",
+  "id": "seti_1OqStKDEQaroqDjsViPOvE1v",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhurwDEQaroqDjsbb5HXAJd",
+  "latest_attempt": "setatt_1OqStKDEQaroqDjsd8GDPuOB",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhurwDEQaroqDjsxwOBLT2W",
+  "payment_method": "pm_1OqStKDEQaroqDjs9VAoMbO7",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.create.1.json
index 0ad160066c..0204b234e5 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED023ntITvVeqcFrQPVTx93ryyRnJk83sKzDXfBlDdzJ0pTuWb",
+  "id": "cs_test_NORMALIZED0278WQ4tJpbbHTeO8NIFmLFBcixhIwC0c9Rntb9wrQD8Gzv7",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "14",
+    "remote_server_user_id": "16",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhurvDEQaroqDjssQrW95XD",
+  "setup_intent": "seti_1OqStJDEQaroqDjs1Q2trIM6",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED023ntITvVeqcFrQPVTx93ryyRnJk83sKzDXfBlDdzJ0pTuWb#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED0278WQ4tJpbbHTeO8NIFmLFBcixhIwC0c9Rntb9wrQD8Gzv7#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.list.1.json
index 471ae037a4..a4fabb28a9 100644
--- a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED023ntITvVeqcFrQPVTx93ryyRnJk83sKzDXfBlDdzJ0pTuWb",
+      "id": "cs_test_NORMALIZED0278WQ4tJpbbHTeO8NIFmLFBcixhIwC0c9Rntb9wrQD8Gzv7",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "14",
+        "remote_server_user_id": "16",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhurvDEQaroqDjssQrW95XD",
+      "setup_intent": "seti_1OqStJDEQaroqDjs1Q2trIM6",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED023ntITvVeqcFrQPVTx93ryyRnJk83sKzDXfBlDdzJ0pTuWb#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED0278WQ4tJpbbHTeO8NIFmLFBcixhIwC0c9Rntb9wrQD8Gzv7#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.modify.1.json
index 5aa523fdeb..bf9f91dde2 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhupbDEQaroqDjsmWbes5wC",
+    "default_payment_method": "pm_1OqSqbDEQaroqDjsf1wX4B67",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.1.json
index 5fbeed3925..e381d6f557 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupbDEQaroqDjsmWbes5wC",
+      "id": "pm_1OqSqbDEQaroqDjsf1wX4B67",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.2.json
index 5fbeed3925..e381d6f557 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupbDEQaroqDjsmWbes5wC",
+      "id": "pm_1OqSqbDEQaroqDjsf1wX4B67",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.3.json
index 5fbeed3925..e381d6f557 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupbDEQaroqDjsmWbes5wC",
+      "id": "pm_1OqSqbDEQaroqDjsf1wX4B67",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.4.json
index 5fbeed3925..e381d6f557 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupbDEQaroqDjsmWbes5wC",
+      "id": "pm_1OqSqbDEQaroqDjsf1wX4B67",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.5.json
index 5fbeed3925..e381d6f557 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.5.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupbDEQaroqDjsmWbes5wC",
+      "id": "pm_1OqSqbDEQaroqDjsf1wX4B67",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.6.json
index 5fbeed3925..e381d6f557 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.6.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupbDEQaroqDjsmWbes5wC",
+      "id": "pm_1OqSqbDEQaroqDjsf1wX4B67",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Event.list.1.json
index 4882d41323..f3153019b4 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhupbDEQaroqDjsmWbes5wC",
+            "default_payment_method": "pm_1OqSqbDEQaroqDjsf1wX4B67",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhupcDEQaroqDjsqUvzubaW",
+      "id": "evt_1OqSqcDEQaroqDjs6n9HiPWU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "3bc5936f-3670-4b36-aec9-22f8f3171ef3"
+        "idempotency_key": "6c9ecb1e-b038-4eb4-a4c3-442d5c52f59a"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.create.1.json
index f98a01a62b..10c8997da3 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupbDEQaroqDjsaesXkbuA_secret_PWyngfgqhdnkk3iXZIBuJMSNVPWkfm4",
+  "client_secret": "seti_1OqSqbDEQaroqDjsJ8DA4YNm_secret_PfoTgPsQG2KpTxGP7iRT6FOHtEQvF1j",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupbDEQaroqDjsaesXkbuA",
+  "id": "seti_1OqSqbDEQaroqDjsJ8DA4YNm",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupbDEQaroqDjsqKkxER2I",
+  "latest_attempt": "setatt_1OqSqbDEQaroqDjsdxrS6Hv3",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupbDEQaroqDjsmWbes5wC",
+  "payment_method": "pm_1OqSqbDEQaroqDjsf1wX4B67",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.list.1.json
index f29c3bdbed..101c23a875 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhupaDEQaroqDjsDP0TOkfp_secret_PWyncJYdVbEEufz41FBRENbyQecwbQ9",
+      "client_secret": "seti_1OqSqaDEQaroqDjsqKNJ4m45_secret_PfoTgesCAAHS8cMI1fZ8hkjLyQcm8C9",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhupaDEQaroqDjsDP0TOkfp",
+      "id": "seti_1OqSqaDEQaroqDjsqKNJ4m45",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.retrieve.1.json
index f98a01a62b..10c8997da3 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupbDEQaroqDjsaesXkbuA_secret_PWyngfgqhdnkk3iXZIBuJMSNVPWkfm4",
+  "client_secret": "seti_1OqSqbDEQaroqDjsJ8DA4YNm_secret_PfoTgPsQG2KpTxGP7iRT6FOHtEQvF1j",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupbDEQaroqDjsaesXkbuA",
+  "id": "seti_1OqSqbDEQaroqDjsJ8DA4YNm",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupbDEQaroqDjsqKkxER2I",
+  "latest_attempt": "setatt_1OqSqbDEQaroqDjsdxrS6Hv3",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupbDEQaroqDjsmWbes5wC",
+  "payment_method": "pm_1OqSqbDEQaroqDjsf1wX4B67",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.create.1.json
index a9736b14de..2197906baf 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01VQwpApbHBHwmgaoA50jFLeOpiniDk9caIPWXtPqncKNoxn",
+  "id": "cs_test_NORMALIZED013f6R9lchSeLGBOzI9aVNi8rj4vaYVmzMSaM06B134Vuct6",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "11",
+    "remote_realm_user_id": "12",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhupaDEQaroqDjsDP0TOkfp",
+  "setup_intent": "seti_1OqSqaDEQaroqDjsqKNJ4m45",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01VQwpApbHBHwmgaoA50jFLeOpiniDk9caIPWXtPqncKNoxn#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED013f6R9lchSeLGBOzI9aVNi8rj4vaYVmzMSaM06B134Vuct6#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.list.1.json
index 8b22cc7879..f7fd90b1c8 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01VQwpApbHBHwmgaoA50jFLeOpiniDk9caIPWXtPqncKNoxn",
+      "id": "cs_test_NORMALIZED013f6R9lchSeLGBOzI9aVNi8rj4vaYVmzMSaM06B134Vuct6",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "11",
+        "remote_realm_user_id": "12",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhupaDEQaroqDjsDP0TOkfp",
+      "setup_intent": "seti_1OqSqaDEQaroqDjsqKNJ4m45",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01VQwpApbHBHwmgaoA50jFLeOpiniDk9caIPWXtPqncKNoxn#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED013f6R9lchSeLGBOzI9aVNi8rj4vaYVmzMSaM06B134Vuct6#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.modify.1.json
index cc51aecce4..c55468c41a 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhusADEQaroqDjsouFigwed",
+    "default_payment_method": "pm_1OqStYDEQaroqDjst5AtJ4RO",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.1.json
index 2542098df9..a8a2d8af1c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusADEQaroqDjsouFigwed",
+      "id": "pm_1OqStYDEQaroqDjst5AtJ4RO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.2.json
index 2542098df9..a8a2d8af1c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusADEQaroqDjsouFigwed",
+      "id": "pm_1OqStYDEQaroqDjst5AtJ4RO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.3.json
index 2542098df9..a8a2d8af1c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.3.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusADEQaroqDjsouFigwed",
+      "id": "pm_1OqStYDEQaroqDjst5AtJ4RO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.4.json
index 2542098df9..a8a2d8af1c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.4.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusADEQaroqDjsouFigwed",
+      "id": "pm_1OqStYDEQaroqDjst5AtJ4RO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.5.json
index 2542098df9..a8a2d8af1c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.5.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusADEQaroqDjsouFigwed",
+      "id": "pm_1OqStYDEQaroqDjst5AtJ4RO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.6.json
index 2542098df9..a8a2d8af1c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.6.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhusADEQaroqDjsouFigwed",
+      "id": "pm_1OqStYDEQaroqDjst5AtJ4RO",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Event.list.1.json
index 9c59531fbf..742c9bccbf 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Event.list.1.json
@@ -19,7 +19,7 @@
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhusADEQaroqDjsouFigwed",
+            "default_payment_method": "pm_1OqStYDEQaroqDjst5AtJ4RO",
             "footer": null,
             "rendering_options": null
           },
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhusCDEQaroqDjsCf1GBFuQ",
+      "id": "evt_1OqStZDEQaroqDjsTyqjmiQL",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "32cace45-b3b2-400a-8c16-02b5ab3429e8"
+        "idempotency_key": "3a033ef0-547c-4856-bd55-d37c112e40cc"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.create.1.json
index 52598ccc96..8912d4e24a 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusADEQaroqDjs1QQ8dumG_secret_PWypTw5oPwG4PSBHWSIrPIl6ileIf7F",
+  "client_secret": "seti_1OqStYDEQaroqDjsVYmhH4S5_secret_PfoWZ41CNoyQsqL5229Wok0CoNPeODk",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusADEQaroqDjs1QQ8dumG",
+  "id": "seti_1OqStYDEQaroqDjsVYmhH4S5",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusADEQaroqDjs8tlpHSc9",
+  "latest_attempt": "setatt_1OqStYDEQaroqDjsx4MTVRTs",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusADEQaroqDjsouFigwed",
+  "payment_method": "pm_1OqStYDEQaroqDjst5AtJ4RO",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.list.1.json
index bf98c6a9f8..7faa84f7b6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1Ohus9DEQaroqDjsBM3F2xpL_secret_PWypGP3jnWaYpQphW9FQeF9JGKbrMYt",
+      "client_secret": "seti_1OqStXDEQaroqDjsh9LvVvEb_secret_PfoWiwxblUfx6oiJ6ZrNQyCMEwj9sI9",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1Ohus9DEQaroqDjsBM3F2xpL",
+      "id": "seti_1OqStXDEQaroqDjsh9LvVvEb",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.retrieve.1.json
index 52598ccc96..8912d4e24a 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhusADEQaroqDjs1QQ8dumG_secret_PWypTw5oPwG4PSBHWSIrPIl6ileIf7F",
+  "client_secret": "seti_1OqStYDEQaroqDjsVYmhH4S5_secret_PfoWZ41CNoyQsqL5229Wok0CoNPeODk",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhusADEQaroqDjs1QQ8dumG",
+  "id": "seti_1OqStYDEQaroqDjsVYmhH4S5",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhusADEQaroqDjs8tlpHSc9",
+  "latest_attempt": "setatt_1OqStYDEQaroqDjsx4MTVRTs",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhusADEQaroqDjsouFigwed",
+  "payment_method": "pm_1OqStYDEQaroqDjst5AtJ4RO",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.create.1.json
index 56ed8dab13..5f2f268cfb 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.create.1.json
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01fSwvRiHNqSj8AB08LoNkRkE0VZ62VEeTo7VRCxJLZVmsTY",
+  "id": "cs_test_NORMALIZED01PVcffboSiaXtHZAwU1FiKLn0mJOnJMqXGYCMglQrTygGYP",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_server_user_id": "15",
+    "remote_server_user_id": "17",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1Ohus9DEQaroqDjsBM3F2xpL",
+  "setup_intent": "seti_1OqStXDEQaroqDjsh9LvVvEb",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01fSwvRiHNqSj8AB08LoNkRkE0VZ62VEeTo7VRCxJLZVmsTY#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01PVcffboSiaXtHZAwU1FiKLn0mJOnJMqXGYCMglQrTygGYP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.list.1.json
index f8389a2c07..08104fa47b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.list.1.json
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01fSwvRiHNqSj8AB08LoNkRkE0VZ62VEeTo7VRCxJLZVmsTY",
+      "id": "cs_test_NORMALIZED01PVcffboSiaXtHZAwU1FiKLn0mJOnJMqXGYCMglQrTygGYP",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_server_user_id": "15",
+        "remote_server_user_id": "17",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1Ohus9DEQaroqDjsBM3F2xpL",
+      "setup_intent": "seti_1OqStXDEQaroqDjsh9LvVvEb",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://selfhosting.testserver/server/6cde5f7a-1f7e-4978-9716-49f69ebfc9fe/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01fSwvRiHNqSj8AB08LoNkRkE0VZ62VEeTo7VRCxJLZVmsTY#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01PVcffboSiaXtHZAwU1FiKLn0mJOnJMqXGYCMglQrTygGYP#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.modify.1.json
index d6058f7e81..46ec94089f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+    "default_payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.1.json
index 79d6eace21..1abc10eb5f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+      "id": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.2.json
index 79d6eace21..1abc10eb5f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+      "id": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.3.json
index 79d6eace21..1abc10eb5f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+      "id": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.4.json
index 79d6eace21..1abc10eb5f 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+      "id": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.5.json
index a692a71d58..fda13d19e0 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.5.json
@@ -6,7 +6,7 @@
   "default_currency": "usd",
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+      "id": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 2,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.6.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.6.json
index a692a71d58..fda13d19e0 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.6.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.6.json
@@ -6,7 +6,7 @@
   "default_currency": "usd",
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+      "id": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 2,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.1.json
index 7bb75de854..f65c1165da 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+            "default_payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1OhupkDEQaroqDjsWqZ3Vi9t",
+      "id": "evt_1OqSqlDEQaroqDjsSm4Vkt70",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "6f227b17-d330-41be-bdd1-510bf866b2da"
+        "idempotency_key": "49e5a73a-35bc-4666-bafa-dc92fbea14c7"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.2.json
index 73e6fcd654..35a4465322 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.2.json
@@ -70,7 +70,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+                "payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 176000,
@@ -81,7 +81,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +113,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJvmmK4GMgam6Q75zUw6LBbCHdHPFJ60SCm56QL7unSBvWc76u_DNHBmMLcE2z19oufABRwq6rg3_PgG?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKGTla8GMgZ97hlPvAk6LBaUtqRe81aD2BiijWaXHEqd5Z-13fg2wQVdsnFboAgkgAcMn5bDTKt2f_e0?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +138,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_pUm64WYsYgBnZoqJwEfGui9cE",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_ffqI30ehPIQ2sb8r4nl1ETEhH",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +153,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+          "payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,13 +181,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhupoDEQaroqDjs0M6TnMAc",
+      "id": "evt_3OqSqpDEQaroqDjs1v0OFrvI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "826d6b99-3ad0-4275-90bc-91e6e65eea0e"
+        "idempotency_key": "6d016619-8cc9-41c0-a7be-e6602c8afdc7"
       },
       "type": "payment_intent.succeeded"
     },
@@ -246,7 +246,7 @@
           },
           "paid": true,
           "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+          "payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
           "payment_method_details": {
             "card": {
               "amount_authorized": 176000,
@@ -257,7 +257,7 @@
                 "cvc_check": "pass"
               },
               "country": "US",
-              "exp_month": 2,
+              "exp_month": 3,
               "exp_year": 2025,
               "extended_authorization": {
                 "status": "disabled"
@@ -289,7 +289,7 @@
           "radar_options": {},
           "receipt_email": "hamlet@zulip.com",
           "receipt_number": null,
-          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKJvmmK4GMgYz_dFUV046LBZkMSbC03KX8YkablDCJWdlhgvwyN3knfq-YiLUhDygV2psNFotLA3PUoBj?s=ap",
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKGTla8GMgZXzcw1KwA6LBZ6HrcWQ463rdw-GRUpdWa_2-VfQTbjb2CfNqwG12wBjCgNrWEWvOJEY9g7?s=ap",
           "refunded": false,
           "refunds": {
             "data": [],
@@ -309,13 +309,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhupoDEQaroqDjs0EcguyFk",
+      "id": "evt_3OqSqpDEQaroqDjs1742Dby3",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "826d6b99-3ad0-4275-90bc-91e6e65eea0e"
+        "idempotency_key": "6d016619-8cc9-41c0-a7be-e6602c8afdc7"
       },
       "type": "charge.succeeded"
     },
@@ -366,9 +366,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI10200iGHvO9p3?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwNw0200TM62un2E?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI10200iGHvO9p3/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwNw0200TM62un2E/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -385,6 +385,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -435,6 +436,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -538,16 +540,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuppDEQaroqDjsM9l9QMu2",
+      "id": "evt_1OqSqpDEQaroqDjsNs2QhfTV",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "9fc3c61e-b23b-437b-baa8-567f5077f5fa"
+        "idempotency_key": "9508af0d-a43e-4539-8b66-fb3ce1788c9f"
       },
       "type": "invoice.finalized"
     },
@@ -598,9 +600,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI10200iGHvO9p3?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwNw0200TM62un2E?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI10200iGHvO9p3/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwNw0200TM62un2E/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -617,6 +619,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -667,6 +670,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -770,7 +774,7 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         },
         "previous_attributes": {
           "effective_at": null,
@@ -790,13 +794,13 @@
           }
         }
       },
-      "id": "evt_1OhuppDEQaroqDjszZ7p26p7",
+      "id": "evt_1OqSqpDEQaroqDjs6nmvl5bu",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "9fc3c61e-b23b-437b-baa8-567f5077f5fa"
+        "idempotency_key": "9508af0d-a43e-4539-8b66-fb3ce1788c9f"
       },
       "type": "invoice.updated"
     },
@@ -824,7 +828,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_pUm64WYsYgBnZoqJwEfGui9cE",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_ffqI30ehPIQ2sb8r4nl1ETEhH",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -867,13 +871,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3OhupoDEQaroqDjs0E8dYd9d",
+      "id": "evt_3OqSqpDEQaroqDjs19r6zh6F",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "9fc3c61e-b23b-437b-baa8-567f5077f5fa"
+        "idempotency_key": "9508af0d-a43e-4539-8b66-fb3ce1788c9f"
       },
       "type": "payment_intent.created"
     },
@@ -943,6 +947,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -993,6 +998,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -1096,16 +1102,16 @@
           "total_excluding_tax": 176000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupoDEQaroqDjs22Opq2hr",
+      "id": "evt_1OqSqoDEQaroqDjsuNfRt2wU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "1d370f22-a9ad-4cb2-9555-928c70326397"
+        "idempotency_key": "eb62e45c-bd6e-4b4c-a0c3-a7efc5963680"
       },
       "type": "invoice.created"
     },
@@ -1161,13 +1167,13 @@
           "unit_amount_decimal": "-24000"
         }
       },
-      "id": "evt_1OhupnDEQaroqDjsRQAF3mFa",
+      "id": "evt_1OqSqoDEQaroqDjsoi60NlLj",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "01553b9c-6da5-4a84-ac79-410199d47ea1"
+        "idempotency_key": "1c6730ff-6f02-4914-b8de-4253d7e45102"
       },
       "type": "invoiceitem.created"
     },
@@ -1223,13 +1229,13 @@
           "unit_amount_decimal": "8000"
         }
       },
-      "id": "evt_1OhupnDEQaroqDjs4SLPSGYh",
+      "id": "evt_1OqSqnDEQaroqDjs2y1HOaA4",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "ed0cac1b-59bb-4993-b152-60eaeac856b0"
+        "idempotency_key": "ef5274e5-a974-47c6-9063-4dba610e76d1"
       },
       "type": "invoiceitem.created"
     },
@@ -1245,21 +1251,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+            "default_payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -1275,13 +1281,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1OhupnDEQaroqDjsLwW71UII",
+      "id": "evt_1OqSqnDEQaroqDjsdBtHtxya",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0006",
-        "idempotency_key": "ed0cac1b-59bb-4993-b152-60eaeac856b0"
+        "idempotency_key": "ef5274e5-a974-47c6-9063-4dba610e76d1"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.3.json
index 4696d422ef..22222d6ed5 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -116,6 +117,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -222,13 +224,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhupsDEQaroqDjsVGE0oFdq",
+      "id": "evt_1OqSqrDEQaroqDjsKEPGxWNb",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "826d6b99-3ad0-4275-90bc-91e6e65eea0e"
+        "idempotency_key": "6d016619-8cc9-41c0-a7be-e6602c8afdc7"
       },
       "type": "invoice.payment_succeeded"
     },
@@ -279,9 +281,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -298,6 +300,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -348,6 +351,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -454,13 +458,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1OhuprDEQaroqDjsohc60miH",
+      "id": "evt_1OqSqrDEQaroqDjsu4VPfN6j",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "826d6b99-3ad0-4275-90bc-91e6e65eea0e"
+        "idempotency_key": "6d016619-8cc9-41c0-a7be-e6602c8afdc7"
       },
       "type": "invoice.paid"
     },
@@ -511,9 +515,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -530,6 +534,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -580,6 +585,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000002",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000002",
                 "livemode": false,
                 "metadata": {},
@@ -698,13 +704,13 @@
           }
         }
       },
-      "id": "evt_1OhuprDEQaroqDjs4cNWngmB",
+      "id": "evt_1OqSqrDEQaroqDjsklrW5uYU",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "826d6b99-3ad0-4275-90bc-91e6e65eea0e"
+        "idempotency_key": "6d016619-8cc9-41c0-a7be-e6602c8afdc7"
       },
       "type": "invoice.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.create.1.json
index 8f204802be..871a278cdc 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.finalize_invoice.1.json
index 13b205146e..ada95dbed1 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI002002pRwzixo?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwNw0200TM62un2E?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI002002pRwzixo/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwNw0200TM62un2E/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -213,5 +215,5 @@
   "total_excluding_tax": 176000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.pay.1.json
index 8b112f72a1..92322f38f5 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luSTEwM2xieXVHYjRLeTdWOVY2N0ZxclJmMmhULDk4MDI4ODI30200qr6aj2MN/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9UYUU2NU5MS0h0RDFzQVVzWkE4TmMxb0owVFJjLDEwMDA2NjIwOQ0200ajvjG4Jt/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -110,6 +111,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.create.1.json
index 158401350c..227508db0b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupiDEQaroqDjsVE65dQnH_secret_PWyn14KKjSvpvIeUcZBYkjwjptfL0Nz",
+  "client_secret": "seti_1OqSqjDEQaroqDjsojnd6mT1_secret_PfoT9ggFQMVlm1TKbdJTCFhtnNdDNJc",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupiDEQaroqDjsVE65dQnH",
+  "id": "seti_1OqSqjDEQaroqDjsojnd6mT1",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupjDEQaroqDjs3nDOyWJG",
+  "latest_attempt": "setatt_1OqSqjDEQaroqDjseOVPeGmM",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+  "payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.list.1.json
index ecb119289c..362b29c6fa 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhupiDEQaroqDjszQ4EVEvY_secret_PWyngjN9jdZTKj8cQcHQjd0IqWmiVob",
+      "client_secret": "seti_1OqSqiDEQaroqDjsb4frlJM1_secret_PfoTrVleNlrzn1oiCeghqP7ksTvZg9m",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhupiDEQaroqDjszQ4EVEvY",
+      "id": "seti_1OqSqiDEQaroqDjsb4frlJM1",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.retrieve.1.json
index 158401350c..227508db0b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupiDEQaroqDjsVE65dQnH_secret_PWyn14KKjSvpvIeUcZBYkjwjptfL0Nz",
+  "client_secret": "seti_1OqSqjDEQaroqDjsojnd6mT1_secret_PfoT9ggFQMVlm1TKbdJTCFhtnNdDNJc",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupiDEQaroqDjsVE65dQnH",
+  "id": "seti_1OqSqjDEQaroqDjsojnd6mT1",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupjDEQaroqDjs3nDOyWJG",
+  "latest_attempt": "setatt_1OqSqjDEQaroqDjseOVPeGmM",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupiDEQaroqDjsIb3WdxvI",
+  "payment_method": "pm_1OqSqiDEQaroqDjsH5T8z2qU",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.create.1.json
index 2f07ecd6de..e417446f5b 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02YN9dw64Lan729wQlhgSGKngjlnd5DcrKAKifU9gEBHpxN5",
+  "id": "cs_test_NORMALIZED026FejhO0hm2aWE36RKS9hroj8hbHvHH8Pr421SEffEJrA9s",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "12",
+    "remote_realm_user_id": "13",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhupiDEQaroqDjszQ4EVEvY",
+  "setup_intent": "seti_1OqSqiDEQaroqDjsb4frlJM1",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02YN9dw64Lan729wQlhgSGKngjlnd5DcrKAKifU9gEBHpxN5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED026FejhO0hm2aWE36RKS9hroj8hbHvHH8Pr421SEffEJrA9s#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.list.1.json
index 096f2d5987..1dbd57d204 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02YN9dw64Lan729wQlhgSGKngjlnd5DcrKAKifU9gEBHpxN5",
+      "id": "cs_test_NORMALIZED026FejhO0hm2aWE36RKS9hroj8hbHvHH8Pr421SEffEJrA9s",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "12",
+        "remote_realm_user_id": "13",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhupiDEQaroqDjszQ4EVEvY",
+      "setup_intent": "seti_1OqSqiDEQaroqDjsb4frlJM1",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02YN9dw64Lan729wQlhgSGKngjlnd5DcrKAKifU9gEBHpxN5#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2p1cWxobHZxbGZSZGlpYHFXYGthYHcnP3F3cGApJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED026FejhO0hm2aWE36RKS9hroj8hbHvHH8Pr421SEffEJrA9s#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.create.1.json
index dfd157db5c..980b0a3265 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.create.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -20,7 +20,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.modify.1.json
index 0099a49a34..994c31cd0e 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.modify.1.json
@@ -6,21 +6,21 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+    "default_payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
     "footer": null,
     "rendering_options": null
   },
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json
index 06d03ff3f9..8aa554d060 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+      "id": "pm_1OqSqzDEQaroqDjsXN87FguH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json
index 06d03ff3f9..8aa554d060 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+      "id": "pm_1OqSqzDEQaroqDjsXN87FguH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json
index 06d03ff3f9..8aa554d060 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+      "id": "pm_1OqSqzDEQaroqDjsXN87FguH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json
index 06d03ff3f9..8aa554d060 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json
@@ -6,7 +6,7 @@
   "default_currency": null,
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+      "id": "pm_1OqSqzDEQaroqDjsXN87FguH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 1,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json
index 2c1a1d9df0..366ead7e64 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json
@@ -6,7 +6,7 @@
   "default_currency": "usd",
   "default_source": null,
   "delinquent": false,
-  "description": "zulip.testserver 6e3ae165-ac8",
+  "description": "zulip.testserver 332b5af0-59b",
   "discount": null,
   "email": "hamlet@zulip.com",
   "id": "cus_NORMALIZED0001",
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+      "id": "pm_1OqSqzDEQaroqDjsXN87FguH",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
@@ -66,7 +67,7 @@
   "livemode": false,
   "metadata": {
     "remote_realm_host": "zulip.testserver",
-    "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+    "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
   },
   "name": null,
   "next_invoice_sequence": 2,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.1.json
index f33ca41df8..526281ba03 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.1.json
@@ -12,21 +12,21 @@
           "default_currency": null,
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+            "default_payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -43,13 +43,13 @@
           }
         }
       },
-      "id": "evt_1Ohuq0DEQaroqDjsiSN2C9K5",
+      "id": "evt_1OqSr1DEQaroqDjsdGw1EtjI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0001",
-        "idempotency_key": "a251bfee-4110-411d-b0d6-9dd66603f49c"
+        "idempotency_key": "fc91c58b-8721-4c41-a07b-945c76c825c8"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.2.json
index a545ebb58f..3d9319101a 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.2.json
@@ -1,5 +1,200 @@
 {
   "data": [
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "account_country": "US",
+          "account_name": "Kandra Labs, Inc.",
+          "account_tax_ids": null,
+          "amount_due": 10000,
+          "amount_paid": 10000,
+          "amount_remaining": 0,
+          "amount_shipping": 0,
+          "application": null,
+          "application_fee_amount": null,
+          "attempt_count": 1,
+          "attempted": true,
+          "auto_advance": false,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "status": null
+          },
+          "billing_reason": "manual",
+          "charge": "ch_NORMALIZED00000000000001",
+          "collection_method": "charge_automatically",
+          "created": 1000000000,
+          "currency": "usd",
+          "custom_fields": null,
+          "customer": "cus_NORMALIZED0001",
+          "customer_address": null,
+          "customer_email": "hamlet@zulip.com",
+          "customer_name": null,
+          "customer_phone": null,
+          "customer_shipping": null,
+          "customer_tax_exempt": "none",
+          "customer_tax_ids": [],
+          "default_payment_method": null,
+          "default_source": null,
+          "default_tax_rates": [],
+          "description": null,
+          "discount": null,
+          "discounts": [],
+          "due_date": null,
+          "effective_at": 1000000000,
+          "ending_balance": 0,
+          "footer": null,
+          "from_invoice": null,
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7?s=ap",
+          "id": "in_NORMALIZED00000000000001",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7/pdf?s=ap",
+          "issuer": {
+            "type": "self"
+          },
+          "last_finalization_error": null,
+          "latest_revision": null,
+          "lines": {
+            "data": [
+              {
+                "amount": 10000,
+                "amount_excluding_tax": 10000,
+                "currency": "usd",
+                "description": "Zulip Basic",
+                "discount_amounts": [],
+                "discountable": false,
+                "discounts": [],
+                "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
+                "invoice_item": "ii_NORMALIZED00000000000001",
+                "livemode": false,
+                "metadata": {},
+                "object": "line_item",
+                "period": {
+                  "end": 1000000000,
+                  "start": 1000000000
+                },
+                "plan": null,
+                "price": {
+                  "active": false,
+                  "billing_scheme": "per_unit",
+                  "created": 1000000000,
+                  "currency": "usd",
+                  "custom_unit_amount": null,
+                  "id": "price_NORMALIZED00000000000001",
+                  "livemode": false,
+                  "lookup_key": null,
+                  "metadata": {},
+                  "nickname": null,
+                  "object": "price",
+                  "product": "prod_NORMALIZED0001",
+                  "recurring": null,
+                  "tax_behavior": "unspecified",
+                  "tiers_mode": null,
+                  "transform_quantity": null,
+                  "type": "one_time",
+                  "unit_amount": 10000,
+                  "unit_amount_decimal": "10000"
+                },
+                "proration": false,
+                "proration_details": {
+                  "credited_items": null
+                },
+                "quantity": 1,
+                "subscription": null,
+                "tax_amounts": [],
+                "tax_rates": [],
+                "type": "invoiceitem",
+                "unit_amount_excluding_tax": "10000"
+              }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
+          },
+          "livemode": false,
+          "metadata": {
+            "billing_schedule": "2",
+            "license_management": "automatic",
+            "licenses": "11",
+            "plan_tier": "103"
+          },
+          "next_payment_attempt": null,
+          "number": "NORMALI-0001",
+          "object": "invoice",
+          "on_behalf_of": null,
+          "paid": true,
+          "paid_out_of_band": false,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_settings": {
+            "default_mandate": null,
+            "payment_method_options": null,
+            "payment_method_types": null
+          },
+          "period_end": 1000000000,
+          "period_start": 1000000000,
+          "post_payment_credit_notes_amount": 0,
+          "pre_payment_credit_notes_amount": 0,
+          "quote": null,
+          "receipt_number": null,
+          "rendering": {
+            "amount_tax_display": null,
+            "pdf": {
+              "page_size": "letter"
+            }
+          },
+          "rendering_options": null,
+          "shipping_cost": null,
+          "shipping_details": null,
+          "starting_balance": 0,
+          "statement_descriptor": "Zulip Basic",
+          "status": "paid",
+          "status_transitions": {
+            "finalized_at": 1000000000,
+            "marked_uncollectible_at": null,
+            "paid_at": 1000000000,
+            "voided_at": null
+          },
+          "subscription": null,
+          "subscription_details": {
+            "metadata": null
+          },
+          "subtotal": 10000,
+          "subtotal_excluding_tax": 10000,
+          "tax": null,
+          "test_clock": null,
+          "total": 10000,
+          "total_discount_amounts": [],
+          "total_excluding_tax": 10000,
+          "total_tax_amounts": [],
+          "transfer_data": null,
+          "webhooks_delivered_at": 1000000000
+        },
+        "previous_attributes": {
+          "amount_paid": 0,
+          "amount_remaining": 10000,
+          "attempt_count": 0,
+          "attempted": false,
+          "charge": null,
+          "paid": false,
+          "status": "open",
+          "status_transitions": {
+            "paid_at": null
+          }
+        }
+      },
+      "id": "evt_1OqSr6DEQaroqDjsPmo1wkR9",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "0ec92505-c7f8-4c95-932f-5f5d18ebf6a0"
+      },
+      "type": "invoice.updated"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -70,7 +265,7 @@
                 },
                 "paid": true,
                 "payment_intent": "pi_NORMALIZED00000000000001",
-                "payment_method": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+                "payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
                 "payment_method_details": {
                   "card": {
                     "amount_authorized": 10000,
@@ -81,7 +276,7 @@
                       "cvc_check": "pass"
                     },
                     "country": "US",
-                    "exp_month": 2,
+                    "exp_month": 3,
                     "exp_year": 2025,
                     "extended_authorization": {
                       "status": "disabled"
@@ -113,7 +308,7 @@
                 "radar_options": {},
                 "receipt_email": "hamlet@zulip.com",
                 "receipt_number": null,
-                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKKrmmK4GMgaLjLx4mQo6LBbOTFDBN1uJEbo1BfZRqz3V40GDVNpnqXbmuPmYrGN5nbksjicLpviRK6Oc?s=ap",
+                "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLCTla8GMgZKWDih83I6LBaaqXztdPHBY_0gIr9Cz-73O0AKtXHlPXycIW5NUmWJMPmiioK7KXwI53Op?s=ap",
                 "refunded": false,
                 "refunds": {
                   "data": [],
@@ -138,7 +333,7 @@
             "total_count": 1,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_FpnumghHXuvzEvgGXwdeLQf8U",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_SlBWEcK0LGVhA21emBO2mEZHM",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -153,7 +348,7 @@
           "next_action": null,
           "object": "payment_intent",
           "on_behalf_of": null,
-          "payment_method": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+          "payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
           "payment_method_configuration_details": null,
           "payment_method_options": {
             "card": {
@@ -181,16 +376,144 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohuq4DEQaroqDjs1Nq0R86e",
+      "id": "evt_3OqSr4DEQaroqDjs1Ne5cqWZ",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 1,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "60bfe494-eafc-40bb-b33e-aee1f2ade1d8"
+        "idempotency_key": "0ec92505-c7f8-4c95-932f-5f5d18ebf6a0"
       },
       "type": "payment_intent.succeeded"
     },
+    {
+      "api_version": "2020-08-27",
+      "created": 1000000000,
+      "data": {
+        "object": {
+          "amount": 10000,
+          "amount_captured": 10000,
+          "amount_refunded": 0,
+          "application": null,
+          "application_fee": null,
+          "application_fee_amount": null,
+          "balance_transaction": "txn_NORMALIZED00000000000001",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": null,
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": null,
+            "name": null,
+            "phone": null
+          },
+          "calculated_statement_descriptor": "ZULIP BASIC",
+          "captured": true,
+          "created": 1000000000,
+          "currency": "usd",
+          "customer": "cus_NORMALIZED0001",
+          "description": "Payment for Invoice",
+          "destination": null,
+          "dispute": null,
+          "disputed": false,
+          "failure_balance_transaction": null,
+          "failure_code": null,
+          "failure_message": null,
+          "fraud_details": {},
+          "id": "ch_NORMALIZED00000000000001",
+          "invoice": "in_NORMALIZED00000000000001",
+          "livemode": false,
+          "metadata": {},
+          "object": "charge",
+          "on_behalf_of": null,
+          "order": null,
+          "outcome": {
+            "network_status": "approved_by_network",
+            "reason": null,
+            "risk_level": "normal",
+            "risk_score": 0,
+            "seller_message": "Payment complete.",
+            "type": "authorized"
+          },
+          "paid": true,
+          "payment_intent": "pi_NORMALIZED00000000000001",
+          "payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
+          "payment_method_details": {
+            "card": {
+              "amount_authorized": 10000,
+              "brand": "visa",
+              "checks": {
+                "address_line1_check": null,
+                "address_postal_code_check": null,
+                "cvc_check": "pass"
+              },
+              "country": "US",
+              "exp_month": 3,
+              "exp_year": 2025,
+              "extended_authorization": {
+                "status": "disabled"
+              },
+              "fingerprint": "NORMALIZED000001",
+              "funding": "credit",
+              "incremental_authorization": {
+                "status": "unavailable"
+              },
+              "installments": null,
+              "last4": "4242",
+              "mandate": null,
+              "multicapture": {
+                "status": "unavailable"
+              },
+              "network": "visa",
+              "network_token": {
+                "used": false
+              },
+              "overcapture": {
+                "maximum_amount_capturable": 10000,
+                "status": "unavailable"
+              },
+              "three_d_secure": null,
+              "wallet": null
+            },
+            "type": "card"
+          },
+          "radar_options": {},
+          "receipt_email": "hamlet@zulip.com",
+          "receipt_number": null,
+          "receipt_url": "https://pay.stripe.com/receipts/invoices/CAcaFwoVYWNjdF8xN3ZUa3dERVFhcm9xRGpzKLCTla8GMgb4IcI4OaY6LBaUSEFGVi378bUb4DDFQsY_vOE3dGhNQE_VD3Yo7Di9rY4sW0xbE47xhtMp?s=ap",
+          "refunded": false,
+          "refunds": {
+            "data": [],
+            "has_more": false,
+            "object": "list",
+            "total_count": 0,
+            "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
+          },
+          "review": null,
+          "shipping": null,
+          "source": null,
+          "source_transfer": null,
+          "statement_descriptor": "Zulip Basic",
+          "statement_descriptor_suffix": null,
+          "status": "succeeded",
+          "transfer_data": null,
+          "transfer_group": null
+        }
+      },
+      "id": "evt_3OqSr4DEQaroqDjs1Wdn09UM",
+      "livemode": false,
+      "object": "event",
+      "pending_webhooks": 0,
+      "request": {
+        "id": "req_NORMALIZED0002",
+        "idempotency_key": "0ec92505-c7f8-4c95-932f-5f5d18ebf6a0"
+      },
+      "type": "charge.succeeded"
+    },
     {
       "api_version": "2020-08-27",
       "created": 1000000000,
@@ -238,9 +561,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQw0200300pxVu3?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyMg0200mBcR6xP5?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQw0200300pxVu3/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyMg0200mBcR6xP5/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -257,6 +580,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -363,13 +687,13 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohuq4DEQaroqDjsv2dXNhGJ",
+      "id": "evt_1OqSr5DEQaroqDjsWr6Rd1sr",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "5d062e60-2184-45f0-8656-01d0d23da343"
+        "idempotency_key": "a15f8227-56cd-4788-bce2-49f0e2d6b80a"
       },
       "type": "invoice.finalized"
     },
@@ -420,9 +744,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQw0200300pxVu3?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyMg0200mBcR6xP5?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQw0200300pxVu3/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyMg0200mBcR6xP5/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -439,6 +763,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -562,13 +887,13 @@
           }
         }
       },
-      "id": "evt_1Ohuq4DEQaroqDjsd8Vb5OPJ",
+      "id": "evt_1OqSr4DEQaroqDjsyFf5F7RH",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "5d062e60-2184-45f0-8656-01d0d23da343"
+        "idempotency_key": "a15f8227-56cd-4788-bce2-49f0e2d6b80a"
       },
       "type": "invoice.updated"
     },
@@ -596,7 +921,7 @@
             "total_count": 0,
             "url": "/v1/charges?payment_intent=pi_NORMALIZED00000000000001"
           },
-          "client_secret": "pi_NORMALIZED00000000000001_secret_FpnumghHXuvzEvgGXwdeLQf8U",
+          "client_secret": "pi_NORMALIZED00000000000001_secret_SlBWEcK0LGVhA21emBO2mEZHM",
           "confirmation_method": "automatic",
           "created": 1000000000,
           "currency": "usd",
@@ -639,13 +964,13 @@
           "transfer_group": null
         }
       },
-      "id": "evt_3Ohuq4DEQaroqDjs1N4uO3Rx",
+      "id": "evt_3OqSr4DEQaroqDjs1O631NjR",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0003",
-        "idempotency_key": "5d062e60-2184-45f0-8656-01d0d23da343"
+        "idempotency_key": "a15f8227-56cd-4788-bce2-49f0e2d6b80a"
       },
       "type": "payment_intent.created"
     },
@@ -715,6 +1040,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -818,16 +1144,16 @@
           "total_excluding_tax": 10000,
           "total_tax_amounts": [],
           "transfer_data": null,
-          "webhooks_delivered_at": null
+          "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohuq3DEQaroqDjsVp1D0ZDD",
+      "id": "evt_1OqSr4DEQaroqDjsyRcpOIMt",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0004",
-        "idempotency_key": "2a9339e4-36d5-4423-ac08-b09c86e965c5"
+        "idempotency_key": "40ff946f-2111-4859-8840-7d0bf37db7e5"
       },
       "type": "invoice.created"
     },
@@ -883,13 +1209,13 @@
           "unit_amount_decimal": "10000"
         }
       },
-      "id": "evt_1Ohuq3DEQaroqDjsBdTiQ9Ae",
+      "id": "evt_1OqSr3DEQaroqDjs1aWOUFEs",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "057a1da2-a7e9-478f-8397-4c424c0d74ff"
+        "idempotency_key": "62554898-aa8a-41f0-b250-a03252985b06"
       },
       "type": "invoiceitem.created"
     },
@@ -905,21 +1231,21 @@
           "default_currency": "usd",
           "default_source": null,
           "delinquent": false,
-          "description": "zulip.testserver 6e3ae165-ac8",
+          "description": "zulip.testserver 332b5af0-59b",
           "discount": null,
           "email": "hamlet@zulip.com",
           "id": "cus_NORMALIZED0001",
           "invoice_prefix": "NORMA01",
           "invoice_settings": {
             "custom_fields": null,
-            "default_payment_method": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+            "default_payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
             "footer": null,
             "rendering_options": null
           },
           "livemode": false,
           "metadata": {
             "remote_realm_host": "zulip.testserver",
-            "remote_realm_uuid": "6e3ae165-ac87-411f-9862-bb5bd2755052"
+            "remote_realm_uuid": "332b5af0-59bf-4285-8447-23fb3a302c86"
           },
           "name": null,
           "next_invoice_sequence": 1,
@@ -935,13 +1261,13 @@
           "default_currency": null
         }
       },
-      "id": "evt_1Ohuq3DEQaroqDjsQZ72ijGA",
+      "id": "evt_1OqSr3DEQaroqDjskbl7Sp97",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0005",
-        "idempotency_key": "057a1da2-a7e9-478f-8397-4c424c0d74ff"
+        "idempotency_key": "62554898-aa8a-41f0-b250-a03252985b06"
       },
       "type": "customer.updated"
     }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.3.json
index 500b936755..e545fcc38d 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.3.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.3.json
@@ -47,9 +47,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQz0200tdZgycjC?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQz0200tdZgycjC/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -66,6 +66,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -172,15 +173,15 @@
           "webhooks_delivered_at": 1000000000
         }
       },
-      "id": "evt_1Ohuq7DEQaroqDjsKsStDB7D",
+      "id": "evt_1OqSr6DEQaroqDjs7tQgbPCK",
       "livemode": false,
       "object": "event",
-      "pending_webhooks": 2,
+      "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "60bfe494-eafc-40bb-b33e-aee1f2ade1d8"
+        "idempotency_key": "0ec92505-c7f8-4c95-932f-5f5d18ebf6a0"
       },
-      "type": "invoice.paid"
+      "type": "invoice.payment_succeeded"
     },
     {
       "api_version": "2020-08-27",
@@ -229,9 +230,9 @@
           "ending_balance": 0,
           "footer": null,
           "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQy0200uKS2f2a0?s=ap",
+          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7?s=ap",
           "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQy0200uKS2f2a0/pdf?s=ap",
+          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7/pdf?s=ap",
           "issuer": {
             "type": "self"
           },
@@ -248,6 +249,7 @@
                 "discountable": false,
                 "discounts": [],
                 "id": "il_NORMALIZED00000000000001",
+                "invoice": "in_NORMALIZED00000000000001",
                 "invoice_item": "ii_NORMALIZED00000000000001",
                 "livemode": false,
                 "metadata": {},
@@ -352,29 +354,17 @@
           "total_tax_amounts": [],
           "transfer_data": null,
           "webhooks_delivered_at": 1000000000
-        },
-        "previous_attributes": {
-          "amount_paid": 0,
-          "amount_remaining": 10000,
-          "attempt_count": 0,
-          "attempted": false,
-          "charge": null,
-          "paid": false,
-          "status": "open",
-          "status_transitions": {
-            "paid_at": null
-          }
         }
       },
-      "id": "evt_1Ohuq6DEQaroqDjsWkrwKJjo",
+      "id": "evt_1OqSr6DEQaroqDjsHshBxmgI",
       "livemode": false,
       "object": "event",
       "pending_webhooks": 0,
       "request": {
         "id": "req_NORMALIZED0002",
-        "idempotency_key": "60bfe494-eafc-40bb-b33e-aee1f2ade1d8"
+        "idempotency_key": "0ec92505-c7f8-4c95-932f-5f5d18ebf6a0"
       },
-      "type": "invoice.updated"
+      "type": "invoice.paid"
     }
   ],
   "has_more": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.4.json
index 807ef9a4dc..6d922067af 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.4.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.4.json
@@ -1,188 +1,5 @@
 {
-  "data": [
-    {
-      "api_version": "2020-08-27",
-      "created": 1000000000,
-      "data": {
-        "object": {
-          "account_country": "US",
-          "account_name": "Kandra Labs, Inc.",
-          "account_tax_ids": null,
-          "amount_due": 10000,
-          "amount_paid": 10000,
-          "amount_remaining": 0,
-          "amount_shipping": 0,
-          "application": null,
-          "application_fee_amount": null,
-          "attempt_count": 1,
-          "attempted": true,
-          "auto_advance": false,
-          "automatic_tax": {
-            "enabled": false,
-            "liability": null,
-            "status": null
-          },
-          "billing_reason": "manual",
-          "charge": "ch_NORMALIZED00000000000001",
-          "collection_method": "charge_automatically",
-          "created": 1000000000,
-          "currency": "usd",
-          "custom_fields": null,
-          "customer": "cus_NORMALIZED0001",
-          "customer_address": null,
-          "customer_email": "hamlet@zulip.com",
-          "customer_name": null,
-          "customer_phone": null,
-          "customer_shipping": null,
-          "customer_tax_exempt": "none",
-          "customer_tax_ids": [],
-          "default_payment_method": null,
-          "default_source": null,
-          "default_tax_rates": [],
-          "description": null,
-          "discount": null,
-          "discounts": [],
-          "due_date": null,
-          "effective_at": 1000000000,
-          "ending_balance": 0,
-          "footer": null,
-          "from_invoice": null,
-          "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQz0200tdZgycjC?s=ap",
-          "id": "in_NORMALIZED00000000000001",
-          "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQz0200tdZgycjC/pdf?s=ap",
-          "issuer": {
-            "type": "self"
-          },
-          "last_finalization_error": null,
-          "latest_revision": null,
-          "lines": {
-            "data": [
-              {
-                "amount": 10000,
-                "amount_excluding_tax": 10000,
-                "currency": "usd",
-                "description": "Zulip Basic",
-                "discount_amounts": [],
-                "discountable": false,
-                "discounts": [],
-                "id": "il_NORMALIZED00000000000001",
-                "invoice_item": "ii_NORMALIZED00000000000001",
-                "livemode": false,
-                "metadata": {},
-                "object": "line_item",
-                "period": {
-                  "end": 1000000000,
-                  "start": 1000000000
-                },
-                "plan": null,
-                "price": {
-                  "active": false,
-                  "billing_scheme": "per_unit",
-                  "created": 1000000000,
-                  "currency": "usd",
-                  "custom_unit_amount": null,
-                  "id": "price_NORMALIZED00000000000001",
-                  "livemode": false,
-                  "lookup_key": null,
-                  "metadata": {},
-                  "nickname": null,
-                  "object": "price",
-                  "product": "prod_NORMALIZED0001",
-                  "recurring": null,
-                  "tax_behavior": "unspecified",
-                  "tiers_mode": null,
-                  "transform_quantity": null,
-                  "type": "one_time",
-                  "unit_amount": 10000,
-                  "unit_amount_decimal": "10000"
-                },
-                "proration": false,
-                "proration_details": {
-                  "credited_items": null
-                },
-                "quantity": 1,
-                "subscription": null,
-                "tax_amounts": [],
-                "tax_rates": [],
-                "type": "invoiceitem",
-                "unit_amount_excluding_tax": "10000"
-              }
-            ],
-            "has_more": false,
-            "object": "list",
-            "total_count": 1,
-            "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-          },
-          "livemode": false,
-          "metadata": {
-            "billing_schedule": "2",
-            "license_management": "automatic",
-            "licenses": "11",
-            "plan_tier": "103"
-          },
-          "next_payment_attempt": null,
-          "number": "NORMALI-0002",
-          "object": "invoice",
-          "on_behalf_of": null,
-          "paid": true,
-          "paid_out_of_band": false,
-          "payment_intent": "pi_NORMALIZED00000000000001",
-          "payment_settings": {
-            "default_mandate": null,
-            "payment_method_options": null,
-            "payment_method_types": null
-          },
-          "period_end": 1000000000,
-          "period_start": 1000000000,
-          "post_payment_credit_notes_amount": 0,
-          "pre_payment_credit_notes_amount": 0,
-          "quote": null,
-          "receipt_number": null,
-          "rendering": {
-            "amount_tax_display": null,
-            "pdf": {
-              "page_size": "letter"
-            }
-          },
-          "rendering_options": null,
-          "shipping_cost": null,
-          "shipping_details": null,
-          "starting_balance": 0,
-          "statement_descriptor": "Zulip Basic",
-          "status": "paid",
-          "status_transitions": {
-            "finalized_at": 1000000000,
-            "marked_uncollectible_at": null,
-            "paid_at": 1000000000,
-            "voided_at": null
-          },
-          "subscription": null,
-          "subscription_details": {
-            "metadata": null
-          },
-          "subtotal": 10000,
-          "subtotal_excluding_tax": 10000,
-          "tax": null,
-          "test_clock": null,
-          "total": 10000,
-          "total_discount_amounts": [],
-          "total_excluding_tax": 10000,
-          "total_tax_amounts": [],
-          "transfer_data": null,
-          "webhooks_delivered_at": 1000000000
-        }
-      },
-      "id": "evt_1Ohuq7DEQaroqDjs6NpZKh6Y",
-      "livemode": false,
-      "object": "event",
-      "pending_webhooks": 0,
-      "request": {
-        "id": "req_NORMALIZED0002",
-        "idempotency_key": "60bfe494-eafc-40bb-b33e-aee1f2ade1d8"
-      },
-      "type": "invoice.payment_succeeded"
-    }
-  ],
+  "data": [],
   "has_more": false,
   "object": "list",
   "url": "/v1/events"
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.5.json
deleted file mode 100644
index 6d922067af..0000000000
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": [],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/events"
-}
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.create.1.json
index a7cd7f6149..83339f0557 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -163,5 +164,5 @@
   "total_excluding_tax": 10000,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json
index 0c5f26d44c..f7802ffa0c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQw0200300pxVu3?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyMg0200mBcR6xP5?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQw0200300pxVu3/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyMg0200mBcR6xP5/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json
index 0c899b920a..369c3dfd97 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQy0200uKS2f2a0?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3luM1NyMnhhSnNHSm5sOXNOeWpTUmpmQUliaUNuLDk4MDI4ODQy0200uKS2f2a0/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9VWms0dVdrZ3NnVUFPSTFVM21DbWJnVkJHVUVqLDEwMDA2NjIyNA0200IPkF1An7/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json
index bfa86122c5..da89807bee 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupyDEQaroqDjscMqg9KXs_secret_PWyn7lbC8RyJBrya1wpdMfbKlPmMX3Q",
+  "client_secret": "seti_1OqSqzDEQaroqDjsw7smvLZI_secret_PfoTMpUZKMcS0rg4gKzIHCapgTxnZOM",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupyDEQaroqDjscMqg9KXs",
+  "id": "seti_1OqSqzDEQaroqDjsw7smvLZI",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupyDEQaroqDjsGmpoAIlM",
+  "latest_attempt": "setatt_1OqSqzDEQaroqDjsnRb3bLat",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+  "payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json
index 6f776fde8d..778b9b2dd6 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhupyDEQaroqDjsrU2Y3tGr_secret_PWyny0w8NcMP5oSTbycAkFARg2gPXXF",
+      "client_secret": "seti_1OqSqyDEQaroqDjsmKxura0t_secret_PfoTPtglsazNxYFfL6Rc9zLrYCx2nXx",
       "created": 1000000000,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhupyDEQaroqDjsrU2Y3tGr",
+      "id": "seti_1OqSqyDEQaroqDjsmKxura0t",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json
index bfa86122c5..da89807bee 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhupyDEQaroqDjscMqg9KXs_secret_PWyn7lbC8RyJBrya1wpdMfbKlPmMX3Q",
+  "client_secret": "seti_1OqSqzDEQaroqDjsw7smvLZI_secret_PfoTMpUZKMcS0rg4gKzIHCapgTxnZOM",
   "created": 1000000000,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhupyDEQaroqDjscMqg9KXs",
+  "id": "seti_1OqSqzDEQaroqDjsw7smvLZI",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhupyDEQaroqDjsGmpoAIlM",
+  "latest_attempt": "setatt_1OqSqzDEQaroqDjsnRb3bLat",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhupyDEQaroqDjsKOiUgVP6",
+  "payment_method": "pm_1OqSqzDEQaroqDjsXN87FguH",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json
index 023caf9d75..b9c79128f5 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json
@@ -9,7 +9,7 @@
     "status": null
   },
   "billing_address_collection": "required",
-  "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+  "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
   "client_reference_id": null,
   "client_secret": null,
   "consent": null,
@@ -36,13 +36,13 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED02vgCuxhNahvuRLFiPzsV2nZVGaMCND4mon7mXXWdqBnSqxD",
+  "id": "cs_test_NORMALIZED029sL0avCMqJxWO8bqQKYrYYbDWlN0mN1BrrfJpHkJHHREfD",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
   "locale": null,
   "metadata": {
-    "remote_realm_user_id": "13",
+    "remote_realm_user_id": "14",
     "type": "card_update"
   },
   "mode": "setup",
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhupyDEQaroqDjsrU2Y3tGr",
+  "setup_intent": "seti_1OqSqyDEQaroqDjsmKxura0t",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -68,8 +72,8 @@
   "status": "open",
   "submit_type": null,
   "subscription": null,
-  "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+  "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vgCuxhNahvuRLFiPzsV2nZVGaMCND4mon7mXXWdqBnSqxD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED029sL0avCMqJxWO8bqQKYrYYbDWlN0mN1BrrfJpHkJHHREfD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json
index b9039dd3dd..08bf76d20d 100644
--- a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json
@@ -11,7 +11,7 @@
         "status": null
       },
       "billing_address_collection": "required",
-      "cancel_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/upgrade/?manual_license_management=false&tier=1",
+      "cancel_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/upgrade/?manual_license_management=false&tier=1",
       "client_reference_id": null,
       "client_secret": null,
       "consent": null,
@@ -38,13 +38,13 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED02vgCuxhNahvuRLFiPzsV2nZVGaMCND4mon7mXXWdqBnSqxD",
+      "id": "cs_test_NORMALIZED029sL0avCMqJxWO8bqQKYrYYbDWlN0mN1BrrfJpHkJHHREfD",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
       "locale": null,
       "metadata": {
-        "remote_realm_user_id": "13",
+        "remote_realm_user_id": "14",
         "type": "card_update"
       },
       "mode": "setup",
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhupyDEQaroqDjsrU2Y3tGr",
+      "setup_intent": "seti_1OqSqyDEQaroqDjsmKxura0t",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -70,10 +74,10 @@
       "status": "open",
       "submit_type": null,
       "subscription": null,
-      "success_url": "http://selfhosting.testserver/realm/6e3ae165-ac87-411f-9862-bb5bd2755052/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
+      "success_url": "http://selfhosting.testserver/realm/332b5af0-59bf-4285-8447-23fb3a302c86/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED02vgCuxhNahvuRLFiPzsV2nZVGaMCND4mon7mXXWdqBnSqxD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED029sL0avCMqJxWO8bqQKYrYYbDWlN0mN1BrrfJpHkJHHREfD#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.modify.1.json
index 88fe84060f..0b426351fd 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.modify.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.modify.1.json
@@ -13,7 +13,7 @@
   "invoice_prefix": "NORMA01",
   "invoice_settings": {
     "custom_fields": null,
-    "default_payment_method": "pm_1OhunkDEQaroqDjsMtCcYOB2",
+    "default_payment_method": "pm_1OqSoGDEQaroqDjs8btHGwc1",
     "footer": null,
     "rendering_options": null
   },
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.1.json
index 41c0e43876..d8ab1a4582 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.1.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunkDEQaroqDjsMtCcYOB2",
+      "id": "pm_1OqSoGDEQaroqDjs8btHGwc1",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.2.json
index 41c0e43876..d8ab1a4582 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.2.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.2.json
@@ -35,7 +35,8 @@
           "cvc_check": "pass"
         },
         "country": "US",
-        "exp_month": 2,
+        "display_brand": "visa",
+        "exp_month": 3,
         "exp_year": 2025,
         "fingerprint": "NORMALIZED000001",
         "funding": "credit",
@@ -54,7 +55,7 @@
       },
       "created": 1010000002,
       "customer": "cus_NORMALIZED0001",
-      "id": "pm_1OhunkDEQaroqDjsMtCcYOB2",
+      "id": "pm_1OqSoGDEQaroqDjs8btHGwc1",
       "livemode": false,
       "metadata": {},
       "object": "payment_method",
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.create.1.json
index 70d20e6a33..4603c1b636 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.create.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhunlDEQaroqDjsRRgOpOL2_secret_PWylOKZnjmislYizu2OqnMcMPOswtbN",
-  "created": 1010000003,
+  "client_secret": "seti_1OqSoGDEQaroqDjsVkDjrAK3_secret_PfoRlvwH0mkFU20giZCceOw8i9EQF8N",
+  "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhunlDEQaroqDjsRRgOpOL2",
+  "id": "seti_1OqSoGDEQaroqDjsVkDjrAK3",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhunlDEQaroqDjsTWCmersY",
+  "latest_attempt": "setatt_1OqSoGDEQaroqDjs9j9FYOIn",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhunkDEQaroqDjsMtCcYOB2",
+  "payment_method": "pm_1OqSoGDEQaroqDjs8btHGwc1",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.list.1.json
index 2a43f60a11..3717489072 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.list.1.json
@@ -4,12 +4,12 @@
       "application": null,
       "automatic_payment_methods": null,
       "cancellation_reason": null,
-      "client_secret": "seti_1OhunkDEQaroqDjsrPJrL20h_secret_PWylG7RocVGS20z4Q9hIIpKqhFBg4xK",
-      "created": 1010000002,
+      "client_secret": "seti_1OqSoFDEQaroqDjsjwt9L8fR_secret_PfoRiqFp6XBOmVr7Oas4quk3NkrzrYK",
+      "created": 1010000001,
       "customer": "cus_NORMALIZED0001",
       "description": null,
       "flow_directions": null,
-      "id": "seti_1OhunkDEQaroqDjsrPJrL20h",
+      "id": "seti_1OqSoFDEQaroqDjsjwt9L8fR",
       "last_setup_error": null,
       "latest_attempt": null,
       "livemode": false,
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.retrieve.1.json
index 70d20e6a33..4603c1b636 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.retrieve.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.retrieve.1.json
@@ -2,21 +2,21 @@
   "application": null,
   "automatic_payment_methods": null,
   "cancellation_reason": null,
-  "client_secret": "seti_1OhunlDEQaroqDjsRRgOpOL2_secret_PWylOKZnjmislYizu2OqnMcMPOswtbN",
-  "created": 1010000003,
+  "client_secret": "seti_1OqSoGDEQaroqDjsVkDjrAK3_secret_PfoRlvwH0mkFU20giZCceOw8i9EQF8N",
+  "created": 1010000002,
   "customer": "cus_NORMALIZED0001",
   "description": null,
   "flow_directions": null,
-  "id": "seti_1OhunlDEQaroqDjsRRgOpOL2",
+  "id": "seti_1OqSoGDEQaroqDjsVkDjrAK3",
   "last_setup_error": null,
-  "latest_attempt": "setatt_1OhunlDEQaroqDjsTWCmersY",
+  "latest_attempt": "setatt_1OqSoGDEQaroqDjs9j9FYOIn",
   "livemode": false,
   "mandate": null,
   "metadata": {},
   "next_action": null,
   "object": "setup_intent",
   "on_behalf_of": null,
-  "payment_method": "pm_1OhunkDEQaroqDjsMtCcYOB2",
+  "payment_method": "pm_1OqSoGDEQaroqDjs8btHGwc1",
   "payment_method_configuration_details": null,
   "payment_method_options": {
     "card": {
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.create.1.json
index b25baece44..9439fb56b3 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.create.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.create.1.json
@@ -14,7 +14,7 @@
   "client_secret": null,
   "consent": null,
   "consent_collection": null,
-  "created": 1010000002,
+  "created": 1010000001,
   "currency": null,
   "currency_conversion": null,
   "custom_fields": [],
@@ -36,7 +36,7 @@
   },
   "customer_email": null,
   "expires_at": 1000000000,
-  "id": "cs_test_NORMALIZED01D6XljhYCWtwUsKP1NkdhrmAmR1fqIwo1T52kBFEow5c3VZ",
+  "id": "cs_test_NORMALIZED01Vo9M8HETdNwvkJy49Krt2Re93m3tvM8JmwvOGMZQ5EUEPZ",
   "invoice": null,
   "invoice_creation": null,
   "livemode": false,
@@ -51,7 +51,11 @@
   "payment_link": null,
   "payment_method_collection": "always",
   "payment_method_configuration_details": null,
-  "payment_method_options": {},
+  "payment_method_options": {
+    "card": {
+      "request_three_d_secure": "automatic"
+    }
+  },
   "payment_method_types": [
     "card"
   ],
@@ -60,7 +64,7 @@
     "enabled": false
   },
   "recovered_from": null,
-  "setup_intent": "seti_1OhunkDEQaroqDjsrPJrL20h",
+  "setup_intent": "seti_1OqSoFDEQaroqDjsjwt9L8fR",
   "shipping": null,
   "shipping_address_collection": null,
   "shipping_options": [],
@@ -71,5 +75,5 @@
   "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
   "total_details": null,
   "ui_mode": "hosted",
-  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01D6XljhYCWtwUsKP1NkdhrmAmR1fqIwo1T52kBFEow5c3VZ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+  "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01Vo9M8HETdNwvkJy49Krt2Re93m3tvM8JmwvOGMZQ5EUEPZ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
 }
diff --git a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.list.1.json
index dfa206fe51..8159a4fd0c 100644
--- a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.list.1.json
+++ b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.list.1.json
@@ -16,7 +16,7 @@
       "client_secret": null,
       "consent": null,
       "consent_collection": null,
-      "created": 1010000002,
+      "created": 1010000001,
       "currency": null,
       "currency_conversion": null,
       "custom_fields": [],
@@ -38,7 +38,7 @@
       },
       "customer_email": null,
       "expires_at": 1000000000,
-      "id": "cs_test_NORMALIZED01D6XljhYCWtwUsKP1NkdhrmAmR1fqIwo1T52kBFEow5c3VZ",
+      "id": "cs_test_NORMALIZED01Vo9M8HETdNwvkJy49Krt2Re93m3tvM8JmwvOGMZQ5EUEPZ",
       "invoice": null,
       "invoice_creation": null,
       "livemode": false,
@@ -53,7 +53,11 @@
       "payment_link": null,
       "payment_method_collection": "always",
       "payment_method_configuration_details": null,
-      "payment_method_options": {},
+      "payment_method_options": {
+        "card": {
+          "request_three_d_secure": "automatic"
+        }
+      },
       "payment_method_types": [
         "card"
       ],
@@ -62,7 +66,7 @@
         "enabled": false
       },
       "recovered_from": null,
-      "setup_intent": "seti_1OhunkDEQaroqDjsrPJrL20h",
+      "setup_intent": "seti_1OqSoFDEQaroqDjsjwt9L8fR",
       "shipping": null,
       "shipping_address_collection": null,
       "shipping_options": [],
@@ -73,7 +77,7 @@
       "success_url": "http://zulip.testserver/billing/event_status/?stripe_session_id={CHECKOUT_SESSION_ID}",
       "total_details": null,
       "ui_mode": "hosted",
-      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01D6XljhYCWtwUsKP1NkdhrmAmR1fqIwo1T52kBFEow5c3VZ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
+      "url": "https://checkout.stripe.com/c/pay/cs_test_NORMALIZED01Vo9M8HETdNwvkJy49Krt2Re93m3tvM8JmwvOGMZQ5EUEPZ#fid1d2BpamRhQ2prcSc%2FJ1ZqcHdmYCVWZGt2JVV3aicpJ2R1bE5gfCc%2FJ3VuWnFgdnFaXVRmMU5zNkldQTY9SnNRY09XZml2UXNQJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ3Zsa2JpYFpmamlwaGsnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl"
     }
   ],
   "has_more": true,
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.1.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.1.json
index d6fb84a005..7df5cc5bbf 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.1.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.1.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 6400,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.2.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.2.json
index 81ac901216..67283a4076 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.2.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.2.json
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 6400,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.1.json
index 41882a34db..23128a7359 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzAy0200QKgeJduW?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Mw0200wYy7eR8K?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzAy0200QKgeJduW/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Mw0200wYy7eR8K/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 6400,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.2.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.2.json
index 34363521db..78e491480e 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA00200OcZAKQIg?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1NQ0200uw32GkWA?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA00200OcZAKQIg/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1NQ0200uw32GkWA/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
@@ -158,5 +159,5 @@
   "total_excluding_tax": 6400,
   "total_tax_amounts": [],
   "transfer_data": null,
-  "webhooks_delivered_at": null
+  "webhooks_delivered_at": 1000000000
 }
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.1.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.1.json
index 5880616850..f2b6af25eb 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.1.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.1.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzA00200Z9V5kfne?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Ng0200baM9lLI7?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzA00200Z9V5kfne/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Ng0200baM9lLI7/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.3.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.3.json
index 42bd4e243b..d28187b3ba 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.3.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.3.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzA10200vqeB9HLj?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Nw0200IrGUOtlT?s=ap",
       "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzA10200vqeB9HLj/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Nw0200IrGUOtlT/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000001",
+            "invoice": "in_NORMALIZED00000000000001",
             "invoice_item": "ii_NORMALIZED00000000000001",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.4.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.4.json
index 7b998bdc5e..60063c0614 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.4.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.4.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA20200QqexxT1q?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1Nw020022mLWQOj?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA20200QqexxT1q/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1Nw020022mLWQOj/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.6.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.6.json
index 357544a85d..98545969e3 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.6.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.6.json
@@ -43,9 +43,9 @@
       "ending_balance": 0,
       "footer": null,
       "from_invoice": null,
-      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA302002m8xhjGm?s=ap",
+      "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1OA0200QmXgrq1h?s=ap",
       "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA302002m8xhjGm/pdf?s=ap",
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1OA0200QmXgrq1h/pdf?s=ap",
       "issuer": {
         "type": "self"
       },
@@ -62,6 +62,7 @@
             "discountable": false,
             "discounts": [],
             "id": "il_NORMALIZED00000000000002",
+            "invoice": "in_NORMALIZED00000000000002",
             "invoice_item": "ii_NORMALIZED00000000000002",
             "livemode": false,
             "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.1.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.1.json
index 4432bed906..2e3857f784 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.1.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.1.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzA10200vqeB9HLj?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Ng0200baM9lLI7?s=ap",
   "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsNkJyd05RZ0JLV205Wkh6TDR5TmN0QXp1ck1ELDk4MDI4NzA10200vqeB9HLj/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SVjVEUVN4Wm1WaU1sT3IwSzJFQVh0M3JKRWJPLDEwMDA2NjA1Ng0200baM9lLI7/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000001",
+        "invoice": "in_NORMALIZED00000000000001",
         "invoice_item": "ii_NORMALIZED00000000000001",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.2.json b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.2.json
index 2270c03ac6..50d58bc62a 100644
--- a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.2.json
+++ b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.2.json
@@ -41,9 +41,9 @@
   "ending_balance": 0,
   "footer": null,
   "from_invoice": null,
-  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA20200QqexxT1q?s=ap",
+  "hosted_invoice_url": "https://invoice.stripe.com/i/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1OA0200QmXgrq1h?s=ap",
   "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QV3lsMlpuQnhDRWNmNkw5NW9WRnFzeFA5anE5TlVVLDk4MDI4NzA20200QqexxT1q/pdf?s=ap",
+  "invoice_pdf": "https://pay.stripe.com/invoice/acct_NORMALIZED000001/test_NORMALIZED01a3dERVFhcm9xRGpzLF9QZm9SZWo1SmRBNzltQ2FacHlwUEFzWFVUNVNMUkZ6LDEwMDA2NjA1OA0200QmXgrq1h/pdf?s=ap",
   "issuer": {
     "type": "self"
   },
@@ -60,6 +60,7 @@
         "discountable": false,
         "discounts": [],
         "id": "il_NORMALIZED00000000000002",
+        "invoice": "in_NORMALIZED00000000000002",
         "invoice_item": "ii_NORMALIZED00000000000002",
         "livemode": false,
         "metadata": {},
diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py
index 316dc21477..bdd2c17f75 100644
--- a/corporate/tests/test_stripe.py
+++ b/corporate/tests/test_stripe.py
@@ -323,6 +323,7 @@ MOCKED_STRIPE_FUNCTION_NAMES = [
         "Invoice.list",
         "Invoice.pay",
         "Invoice.refresh",
+        "Invoice.retrieve",
         "Invoice.upcoming",
         "Invoice.void_invoice",
         "InvoiceItem.create",
@@ -635,15 +636,11 @@ class StripeTestCase(ZulipTestCase):
         is_self_hosted_billing = not isinstance(self.billing_session, RealmBillingSession)
         customer = self.billing_session.get_customer()
         assert customer is not None
-        if (
-            invoice
-            or not talk_to_stripe
-            or (
-                is_free_trial_offer_enabled(is_self_hosted_billing)
-                and
-                # Free trial is not applicable for legacy customers.
-                not is_legacy_customer(customer)
-            )
+        if not talk_to_stripe or (
+            is_free_trial_offer_enabled(is_self_hosted_billing)
+            and
+            # Free trial is not applicable for legacy customers.
+            not is_legacy_customer(customer)
         ):
             # Upgrade already happened for free trial, invoice realms or schedule
             # upgrade for legacy remote servers.
@@ -665,6 +662,10 @@ class StripeTestCase(ZulipTestCase):
             {"status": "sent"},
         )
 
+        if invoice:
+            # Mark the invoice as paid via stripe with the `invoice.paid` event.
+            stripe.Invoice.pay(last_sent_invoice.stripe_invoice_id, paid_out_of_band=True)
+
         # Upgrade the organization.
         self.send_stripe_webhook_events(last_event)
         return upgrade_json_response
@@ -813,7 +814,7 @@ class StripeTest(StripeTestCase):
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response["Location"].startswith("https://billing.stripe.com"))
 
-        self.upgrade()
+        self.upgrade(invoice=True)
 
         response = self.client_get("/customer_portal/?return_to_billing_page=true")
         self.assertEqual(response.status_code, 302)
@@ -994,12 +995,6 @@ class StripeTest(StripeTestCase):
             assert_is_not_none(Customer.objects.get(realm=user.realm).stripe_customer_id)
         )
         self.assertFalse(stripe_customer_has_credit_card_as_default_payment_method(stripe_customer))
-        # It can take a second for Stripe to attach the source to the customer, and in
-        # particular it may not be attached at the time stripe_get_customer is called above,
-        # causing test flakes.
-        # So commenting the next line out, but leaving it here so future readers know what
-        # is supposed to happen here
-        # self.assertEqual(stripe_customer.default_source.type, 'ach_credit_transfer')
 
         # Check Charges in Stripe
         self.assertFalse(stripe.Charge.list(customer=stripe_customer.id))
@@ -1011,10 +1006,10 @@ class StripeTest(StripeTestCase):
             "amount_due": 8000 * 123,
             "amount_paid": 0,
             "attempt_count": 0,
-            "auto_advance": True,
+            "auto_advance": False,
             "collection_method": "send_invoice",
             "statement_descriptor": "Zulip Cloud Standard",
-            "status": "open",
+            "status": "paid",
             "total": 8000 * 123,
         }
         for key, value in invoice_params.items():
@@ -1493,6 +1488,7 @@ class StripeTest(StripeTestCase):
         initial_upgrade_request = InitialUpgradeRequest(
             manual_license_management=False,
             tier=CustomerPlan.TIER_CLOUD_STANDARD,
+            billing_modality="charge_automatically",
         )
         billing_session = RealmBillingSession(hamlet)
         _, context_when_upgrade_page_is_rendered = billing_session.get_initial_upgrade_context(
@@ -1542,11 +1538,13 @@ class StripeTest(StripeTestCase):
     def test_upgrade_race_condition_during_card_upgrade(self, *mocks: Mock) -> None:
         hamlet = self.example_user("hamlet")
         othello = self.example_user("othello")
+        self.login_user(othello)
+        othello_upgrade_page_response = self.client_get("/upgrade/")
 
         self.login_user(hamlet)
-        hamlet_upgrade_page_response = self.client_get("/upgrade/")
         self.add_card_to_customer_for_upgrade()
         [stripe_event_before_upgrade] = iter(stripe.Event.list(limit=1))
+        hamlet_upgrade_page_response = self.client_get("/upgrade/")
         self.client_billing_post(
             "/billing/upgrade",
             {
@@ -1566,8 +1564,21 @@ class StripeTest(StripeTestCase):
         [hamlet_invoice] = iter(stripe.Invoice.list(customer=customer.stripe_customer_id))
 
         self.login_user(othello)
-        # Othello completed the upgrade while we were waiting on success payment event for Hamlet.
-        self.upgrade()
+        with self.settings(CLOUD_FREE_TRIAL_DAYS=60):
+            # Othello completed the upgrade while we were waiting on success payment event for Hamlet.
+            # NOTE: Used free trial to avoid creating any stripe invoice events.
+            self.client_billing_post(
+                "/billing/upgrade",
+                {
+                    "billing_modality": "charge_automatically",
+                    "schedule": "annual",
+                    "signed_seat_count": self.get_signed_seat_count_from_response(
+                        othello_upgrade_page_response
+                    ),
+                    "salt": self.get_salt_from_response(othello_upgrade_page_response),
+                    "license_management": "automatic",
+                },
+            )
 
         with self.assertLogs("corporate.stripe", "WARNING"):
             self.send_stripe_webhook_events(stripe_event_before_upgrade)
@@ -4032,6 +4043,30 @@ class StripeTest(StripeTestCase):
                     email_found = True
             self.assertEqual(row.email_expected_to_be_sent, email_found)
 
+    @mock_stripe()
+    def test_upgrade_pay_by_invoice(self, *mock: Mock) -> None:
+        hamlet = self.example_user("hamlet")
+        self.login_user(hamlet)
+        response = self.client_get("/upgrade/?setup_payment_by_invoice=true")
+        self.assert_in_success_response(["pay by card", "Send invoice"], response)
+
+        # Send invoice
+        response = self.client_billing_post(
+            "/billing/upgrade",
+            {
+                "billing_modality": "send_invoice",
+                "schedule": "annual",
+                "signed_seat_count": self.get_signed_seat_count_from_response(response),
+                "salt": self.get_salt_from_response(response),
+                "license_management": "manual",
+                "licenses": 40,
+            },
+        )
+        self.assert_json_success(response)
+
+        response = self.client_get("/upgrade/?setup_payment_by_invoice=true")
+        self.assert_in_success_response(["An invoice", "has been sent"], response)
+
     @mock_stripe()
     def test_change_plan_tier_from_standard_to_plus(self, *mock: Mock) -> None:
         iago = self.example_user("iago")
@@ -5172,6 +5207,7 @@ class InvoiceTest(StripeTestCase):
         plan.fixed_price = 100
         plan.price_per_license = 0
         plan.save(update_fields=["fixed_price", "price_per_license"])
+        user.realm.refresh_from_db()
         billing_session = RealmBillingSession(realm=user.realm)
         billing_session.invoice_plan(plan, self.next_year)
         stripe_customer_id = plan.customer.stripe_customer_id
@@ -5746,6 +5782,10 @@ class TestSupportBillingHelpers(StripeTestCase):
         billing_session = RealmBillingSession(
             user=support_admin, realm=user.realm, support_session=True
         )
+
+        # Send renewal invoice.
+        invoice_plans_as_needed(self.now + timedelta(days=367))
+
         support_request = SupportViewRequest(
             support_type=SupportType.modify_plan,
             plan_modification="downgrade_now_void_open_invoices",
diff --git a/corporate/views/portico.py b/corporate/views/portico.py
index 57f306915e..c8129b75c8 100644
--- a/corporate/views/portico.py
+++ b/corporate/views/portico.py
@@ -410,6 +410,7 @@ def customer_portal(
     return_to_billing_page: Json[bool] = False,
     manual_license_management: Json[bool] = False,
     tier: Optional[Json[int]] = None,
+    setup_payment_by_invoice: Json[bool] = False,
 ) -> HttpResponseRedirect:
     user = request.user
     assert user.is_authenticated
@@ -419,7 +420,7 @@ def customer_portal(
 
     billing_session = RealmBillingSession(user=user, realm=user.realm)
     review_billing_information_url = billing_session.get_stripe_customer_portal_url(
-        return_to_billing_page, manual_license_management, tier
+        return_to_billing_page, manual_license_management, tier, setup_payment_by_invoice
     )
     return HttpResponseRedirect(review_billing_information_url)
 
@@ -433,9 +434,10 @@ def remote_realm_customer_portal(
     return_to_billing_page: Json[bool] = False,
     manual_license_management: Json[bool] = False,
     tier: Optional[Json[int]] = None,
+    setup_payment_by_invoice: Json[bool] = False,
 ) -> HttpResponseRedirect:
     review_billing_information_url = billing_session.get_stripe_customer_portal_url(
-        return_to_billing_page, manual_license_management, tier
+        return_to_billing_page, manual_license_management, tier, setup_payment_by_invoice
     )
     return HttpResponseRedirect(review_billing_information_url)
 
@@ -449,8 +451,9 @@ def remote_server_customer_portal(
     return_to_billing_page: Json[bool] = False,
     manual_license_management: Json[bool] = False,
     tier: Optional[Json[int]] = None,
+    setup_payment_by_invoice: Json[bool] = False,
 ) -> HttpResponseRedirect:
     review_billing_information_url = billing_session.get_stripe_customer_portal_url(
-        return_to_billing_page, manual_license_management, tier
+        return_to_billing_page, manual_license_management, tier, setup_payment_by_invoice
     )
     return HttpResponseRedirect(review_billing_information_url)
diff --git a/corporate/views/upgrade.py b/corporate/views/upgrade.py
index 396f16a0e5..7949b541db 100644
--- a/corporate/views/upgrade.py
+++ b/corporate/views/upgrade.py
@@ -187,6 +187,7 @@ def upgrade_page(
     request: HttpRequest,
     manual_license_management: bool = REQ(default=False, json_validator=check_bool),
     tier: int = REQ(default=CustomerPlan.TIER_CLOUD_STANDARD, json_validator=check_int),
+    setup_payment_by_invoice: bool = REQ(default=False, json_validator=check_bool),
 ) -> HttpResponse:
     user = request.user
     assert user.is_authenticated
@@ -194,9 +195,14 @@ def upgrade_page(
     if not settings.BILLING_ENABLED or user.is_guest:
         return render(request, "404.html", status=404)
 
+    billing_modality = "charge_automatically"
+    if setup_payment_by_invoice:
+        billing_modality = "send_invoice"
+
     initial_upgrade_request = InitialUpgradeRequest(
         manual_license_management=manual_license_management,
         tier=tier,
+        billing_modality=billing_modality,
     )
     billing_session = RealmBillingSession(user)
     redirect_url, context = billing_session.get_initial_upgrade_context(initial_upgrade_request)
@@ -217,11 +223,17 @@ def remote_realm_upgrade_page(
     manual_license_management: Json[bool] = False,
     success_message: str = "",
     tier: str = str(CustomerPlan.TIER_SELF_HOSTED_BUSINESS),
+    setup_payment_by_invoice: Json[bool] = False,
 ) -> HttpResponse:
+    billing_modality = "charge_automatically"
+    if setup_payment_by_invoice:  # nocoverage
+        billing_modality = "send_invoice"
+
     initial_upgrade_request = InitialUpgradeRequest(
         manual_license_management=manual_license_management,
         tier=int(tier),
         success_message=success_message,
+        billing_modality=billing_modality,
     )
     try:
         redirect_url, context = billing_session.get_initial_upgrade_context(initial_upgrade_request)
@@ -244,11 +256,17 @@ def remote_server_upgrade_page(
     manual_license_management: Json[bool] = False,
     success_message: str = "",
     tier: str = str(CustomerPlan.TIER_SELF_HOSTED_BUSINESS),
+    setup_payment_by_invoice: Json[bool] = False,
 ) -> HttpResponse:
+    billing_modality = "charge_automatically"
+    if setup_payment_by_invoice:  # nocoverage
+        billing_modality = "send_invoice"
+
     initial_upgrade_request = InitialUpgradeRequest(
         manual_license_management=manual_license_management,
         tier=int(tier),
         success_message=success_message,
+        billing_modality=billing_modality,
     )
     try:
         redirect_url, context = billing_session.get_initial_upgrade_context(initial_upgrade_request)
diff --git a/templates/corporate/billing/upgrade.html b/templates/corporate/billing/upgrade.html
index 923b4861ab..77387b8683 100644
--- a/templates/corporate/billing/upgrade.html
+++ b/templates/corporate/billing/upgrade.html
@@ -24,7 +24,7 @@
         {% endif %}
         <div class="pitch">
             <h1>
-                {% if free_trial_days %}
+                {% if page_params.free_trial_days %}
                 Start free trial of
                 {% else %}
                 Upgrade {{ customer_name }} to
@@ -40,8 +40,14 @@
                 <div class="input-box top-of-page-notice upgrade-page-field">
                     <div class="not-editable-realm-field">
                         <a href="{{ pay_by_invoice_payments_page }}" target="_blank" rel="noopener noreferrer">An invoice</a>
-                        for $<span class="due-today-price"></span> has been sent to <b>{{email}}</b>.
-                        To complete the plan upgrade process, please pay the amount due.
+                        {% if fixed_price_plan %}
+                        for $<span class="due-today-price"></span>
+                        {% endif %}
+                        {% if scheduled_upgrade_invoice_amount_due %}
+                        for ${{ scheduled_upgrade_invoice_amount_due }}
+                        {% endif %}
+                        has been sent to <b>{{email}}</b>.
+                        To complete the plan upgrade process, please pay the amount due. Reload this page if already paid.
                     </div>
                 </div>
                 {% else %}
@@ -50,15 +56,19 @@
                     <input type="hidden" name="seat_count" value="{{ seat_count }}" />
                     <input type="hidden" name="signed_seat_count" value="{{ signed_seat_count }}" />
                     <input type="hidden" name="salt" value="{{ salt }}" />
-                    <input type="hidden" name="billing_modality" value="charge_automatically" />
+                    {% if page_params.setup_payment_by_invoice %}
+                        <input type="hidden" name="billing_modality" value="send_invoice" />
+                    {% else %}
+                        <input type="hidden" name="billing_modality" value="charge_automatically" />
+                    {% endif %}
                     <input type="hidden" name="tier" value="{{ page_params.tier }}" />
 
                     <div id="free-trial-top-banner" class="input-box upgrade-page-field">
-                        {% if free_trial_days %}
+                        {% if page_params.free_trial_days %}
                         <div class="not-editable-realm-field">
-                            Add a credit card to start your <b>{{ free_trial_days }}-day free trial</b> of
+                            Add a credit card to start your <b>{{ page_params.free_trial_days }}-day free trial</b> of
                             {{ plan }}. Your card will not be charged if you
-                            cancel in the first {{ free_trial_days }} days.
+                            cancel in the first {{ page_params.free_trial_days }} days.
                         </div>
                         {% endif %}
 
@@ -73,7 +83,7 @@
                         {% endif %}
                     </div>
 
-                    {% if free_trial_days %}
+                    {% if page_params.free_trial_days and not page_params.setup_payment_by_invoice %}
                     <input type="hidden" name="schedule" value="monthly" />
                     {% else %}
                     <div class="input-box upgrade-page-field no-validation">
@@ -131,7 +141,7 @@
                             {% endif %}
                             <span id="due-today-title">
                                 Due
-                                {% if free_trial_days %}
+                                {% if page_params.free_trial_days %}
                                 on {{ free_trial_end_date }}
                                 {% else %}
                                 today
@@ -163,7 +173,7 @@
                                 <span class="flat-discount-separator">$<span class="flat-discounted-price"></span>/month off</span> <i class="billing-page-discount">({{ page_params.flat_discounted_months }} {{ "month" if page_params.flat_discounted_months == 1 else "months" }} remaining)</i>
                                 {% endif %}
                                 <h1>$<span class="due-today-price"></span></h1>
-                                {% if free_trial_days %}
+                                {% if page_params.free_trial_days %}
                                 <i>Your actual bill will depend on the number of
                                 active users in your organization.</i>
                                 {% endif %}
@@ -174,7 +184,7 @@
                         </div>
                     </div>
 
-                    {% if free_trial_days %}
+                    {% if page_params.free_trial_days %}
                     {% elif not manual_license_management %}
                     <div id="license-automatic-section" class="input-box upgrade-page-field license-management-section">
                         <p class="not-editable-realm-field">
@@ -194,15 +204,18 @@
                     <div id="license-manual-section" class="input-box upgrade-page-field license-management-section">
                         <p class="not-editable-realm-field">
                             Your subscription will renew automatically. You will be able to manage the number of licenses on
-                            your organization's billing page. You can also
-                            <a href="{{ page_params.billing_base_url }}/upgrade/?tier={{ page_params.tier }}">choose automatic license management</a> instead. See
-                            <a href="https://zulip.com/help/zulip-cloud-billing">here</a> for details.
+                            your organization's billing page.
+                            {% if not page_params.setup_payment_by_invoice %}
+                            You can also <a href="{{ page_params.billing_base_url }}/upgrade/?tier={{ page_params.tier }}">choose automatic license management</a> instead.
+                            {% endif %}
+                            See <a href="https://zulip.com/help/zulip-cloud-billing">here</a> for details.
                         </p>
                     </div>
                     {% endif %}
                     {% if not is_demo_organization %}
-                    <div {% if payment_method %} id="upgrade-payment-info"{% endif %}>
-                        {% if payment_method %}
+                    <div {% if page_params.setup_payment_by_invoice %} id="update-invoice-billing-info" {% elif payment_method %} id="upgrade-payment-info"{% endif %}>
+                        {% if page_params.setup_payment_by_invoice %}
+                        {% elif payment_method %}
                         <div class="input-box upgrade-page-field no-validation" id="upgrade-payment-menthod-wrapper">
                             <label for="customer-payment-method-for-upgrade" class="inline-block label-title">Payment method</label>
                             <div id="customer-payment-method-for-upgrade" class="not-editable-realm-field">
@@ -210,10 +223,12 @@
                             </div>
                         </div>
                         {% endif %}
-                        <div class="upgrade-add-card-container input-box upgrade-page-field">
-                            <button id="upgrade-add-card-button" {% if payment_method %}class="update-card-button"{% endif %}>
+                        <div id="upgrade-payment-method-container" class="upgrade-add-card-container input-box upgrade-page-field">
+                            <button id="upgrade-add-card-button" {% if page_params.setup_payment_by_invoice %}class="update-billing-information-button"{% elif payment_method %}class="update-card-button"{% endif %}>
                                 <span id="upgrade-add-card-button-text">
-                                    {% if payment_method %}
+                                    {% if page_params.setup_payment_by_invoice %}
+                                    Update billing information
+                                    {% elif payment_method %}
                                     Update card
                                     {% else %}
                                     Add card
@@ -221,8 +236,15 @@
                                 </span>
                                 <object class="loader upgrade-button-loader" type="image/svg+xml" data="{{ static('images/loading/loader-white.svg') }}"></object>
                             </button>
+                            <span class="not-editable-realm-field" id="upgrade-payment-by-invoice-container">
+                                {% if page_params.setup_payment_by_invoice %}
+                                or <a href="{{ page_params.billing_base_url }}/upgrade/?tier={{ page_params.tier }}">pay by card</a>
+                                {% else %}
+                                or <a href="{{ page_params.billing_base_url }}/upgrade/?manual_license_management=true&tier={{ page_params.tier }}&setup_payment_by_invoice=true" id="upgrade-payment-by-invoice-link" data-tippy-content="Requires purchasing a fixed number of licenses" data-tippy-placement="right">pay by invoice</a>
+                                {% endif %}
+                            </span>
                         </div>
-                        {% if not free_trial_days and payment_method %}
+                        {% if not page_params.free_trial_days and payment_method %}
                         <div class="stripe-billing-information not-editable-realm-field">
                             {% if not manual_license_management %}
                             <a href="{{ page_params.billing_base_url }}/customer_portal/?tier={{ page_params.tier }}">View and update</a> billing information that will be displayed on your invoice and receipt.
@@ -236,7 +258,7 @@
                     {% endif %}
                     <!-- Disabled buttons do not fire any events, so we need a container div that isn't disabled for tippyjs to work -->
                     <div class="upgrade-button-container input-box upgrade-page-field" {% if is_demo_organization %}data-tippy-content="{% trans %}Convert demo organization before upgrading.{% endtrans %}"{% endif %}>
-                        <button id="org-upgrade-button{% if is_demo_organization %} permanent-disabled{% endif %}" {% if not payment_method %}disabled{% endif %}>
+                        <button id="org-upgrade-button{% if is_demo_organization %} permanent-disabled{% endif %}" {% if not page_params.setup_payment_by_invoice and not payment_method %}disabled{% endif %}>
                             <span id="org-upgrade-button-text">
                                 {% if remote_server_legacy_plan_end_date %}
                                     <span id="org-future-upgrade-button-text-remote-server">
@@ -244,8 +266,10 @@
                                     </span>
                                 {% endif %}
                                 <span id="org-today-upgrade-button-text">
-                                    {% if free_trial_days %}
-                                        Start {{ free_trial_days }}-day free trial
+                                    {% if page_params.free_trial_days %}
+                                        Start {{ page_params.free_trial_days }}-day free trial
+                                    {% elif page_params.setup_payment_by_invoice %}
+                                        Send invoice
                                     {% else %}
                                         Purchase {{ plan }}
                                     {% endif %}
@@ -268,7 +292,7 @@
                         {% if pay_by_invoice_payments_page %}
                         If you have questions or need to make any changes, please contact <a href="mailto:sales@zulip.com">sales@zulip.com</a>.
                         {% else %}
-                        To pay by invoice or for any other questions, contact <a href="mailto:sales@zulip.com">sales@zulip.com</a>.
+                        Questions? Contact <a href="mailto:sales@zulip.com">sales@zulip.com</a>.
                         {% endif %}
                     </div>
                 </div>
@@ -276,4 +300,39 @@
         </div>
     </div>
 </div>
+{% if page_params.setup_payment_by_invoice %}
+<div id="confirm-send-invoice-modal" class="micromodal" aria-hidden="true">
+    <div class="modal__overlay" tabindex="-1">
+        <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="dialog_title">
+            <header class="modal__header">
+                <h1 class="modal__title dialog_heading">
+                    {% if page_params.free_trial_days %}
+                    Start free trial for {{ plan }}
+                    {% else %}
+                    Send invoice for {{ plan }}
+                    {% endif %}
+                </h1>
+                <button class="modal__close" aria-label="{{ _('Close modal') }}" data-micromodal-close></button>
+            </header>
+            <main class="modal__content">
+                <p>
+                    Make sure you have the correct address for the invoice. Please <a href="{{ page_params.billing_base_url }}/customer_portal/?manual_license_management=true&tier={{ page_params.tier }}&setup_payment_by_invoice=true" target="_blank">update billing information</a> if you haven't done it yet.
+                </p>
+            </main>
+            <footer class="modal__footer">
+                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
+                <button class="modal__btn dialog_submit_button">
+                    <span>
+                        {% if page_params.free_trial_days %}
+                        {{ _('Start free trial') }}
+                        {% else %}
+                        {{ _('Send invoice') }}
+                        {% endif %}
+                    </span>
+                </button>
+            </footer>
+        </div>
+    </div>
+</div>
+{% endif %}
 {% endblock %}
diff --git a/web/src/base_page_params.ts b/web/src/base_page_params.ts
index 3c3a5628e6..edc8df2cef 100644
--- a/web/src/base_page_params.ts
+++ b/web/src/base_page_params.ts
@@ -90,6 +90,8 @@ const upgrade_params_schema = default_params_schema.extend({
     flat_discount: z.number(),
     flat_discounted_months: z.number(),
     fixed_price: z.number().nullable(),
+    setup_payment_by_invoice: z.boolean(),
+    free_trial_days: z.nullable(z.number()),
 });
 
 const page_params_schema = z.discriminatedUnion("page_type", [
diff --git a/web/src/billing/upgrade.ts b/web/src/billing/upgrade.ts
index 99008333e9..8ec58694d4 100644
--- a/web/src/billing/upgrade.ts
+++ b/web/src/billing/upgrade.ts
@@ -2,6 +2,7 @@ import $ from "jquery";
 import {z} from "zod";
 
 import {localstorage} from "../localstorage";
+import * as portico_modals from "../portico/portico_modals";
 
 import * as helpers from "./helpers";
 import type {Prices} from "./helpers";
@@ -129,9 +130,20 @@ function restore_manual_license_count(): void {
 export const initialize = (): void => {
     restore_manual_license_count();
 
-    $("#org-upgrade-button").on("click", (e) => {
+    $("#org-upgrade-button, #confirm-send-invoice-modal .dialog_submit_button").on("click", (e) => {
         e.preventDefault();
 
+        if (page_params.setup_payment_by_invoice) {
+            if ($(e.currentTarget).parents("#confirm-send-invoice-modal").length === 0) {
+                // Open confirm send invoice model if not open.
+                portico_modals.open("confirm-send-invoice-modal");
+                return;
+            }
+
+            // Close modal so that we can show errors on the send invoice button.
+            portico_modals.close_active();
+        }
+
         // Clear the error box in case this is a repeat request.
         const $error_box = $("#autopay-error");
         $error_box.text("");
@@ -145,6 +157,11 @@ export const initialize = (): void => {
             [],
             "POST",
             (response) => {
+                if (page_params.setup_payment_by_invoice && !page_params.free_trial_days) {
+                    window.location.replace(`${page_params.billing_base_url}/upgrade/`);
+                    return;
+                }
+
                 const response_data = upgrade_response_schema.parse(response);
                 if (response_data.stripe_invoice_id) {
                     window.location.replace(
@@ -197,6 +214,13 @@ export const initialize = (): void => {
     });
 
     $("#upgrade-add-card-button").on("click", (e) => {
+        e.preventDefault();
+        if (e.currentTarget.classList.contains("update-billing-information-button")) {
+            const redirect_url = `${page_params.billing_base_url}/customer_portal/?manual_license_management=true&tier=${page_params.tier}&setup_payment_by_invoice=true`;
+            window.open(redirect_url, "_blank");
+            return;
+        }
+
         $("#upgrade-add-card-button #upgrade-add-card-button-text").hide();
         $("#upgrade-add-card-button .loader").show();
         helpers.create_ajax_request(
@@ -213,7 +237,6 @@ export const initialize = (): void => {
                 $("#upgrade-add-card-button #upgrade-add-card-button-text").show();
             },
         );
-        e.preventDefault();
     });
 };
 
diff --git a/web/styles/portico/billing.css b/web/styles/portico/billing.css
index 7b6f0151ec..f8db9e5612 100644
--- a/web/styles/portico/billing.css
+++ b/web/styles/portico/billing.css
@@ -2,6 +2,12 @@
     --color-background-modal: hsl(0deg 0% 98%);
 }
 
+[data-tippy-root] .tippy-box .tippy-content {
+    font-size: 14px;
+    font-weight: normal;
+    color: hsl(0deg 0% 100%);
+}
+
 .billing-upgrade-page {
     font-family: "Source Sans 3 VF", sans-serif;
     background-color: hsl(0deg 0% 98%);
@@ -539,10 +545,28 @@ input[name="licenses"] {
     }
 }
 
+#upgrade-page-details #payment-schedule-select {
+    &:disabled {
+        &:hover {
+            cursor: not-allowed;
+        }
+    }
+}
+
+#upgrade-page-details #upgrade-payment-by-invoice-container {
+    padding-top: 0;
+}
+
+#upgrade-page-details #upgrade-payment-method-container {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
 #upgrade-page-details #upgrade-add-card-button,
 #billing-page-details .user-stripe-card-update .user-stripe-card-update-button {
     margin: 0;
-    width: 150px;
+    width: auto;
 }
 
 #upgrade-page-details #upgrade-cardchange-form {
@@ -595,6 +619,7 @@ input[name="licenses"] {
 #billing-page-details .billing-frequency-message.not-editable-realm-field,
 #free-trial-top-banner .not-editable-realm-field,
 #upgrade-page-details .license-management-section .not-editable-realm-field,
+#upgrade-page-details #payment-by-invoice-setup .not-editable-realm-field,
 #upgrade-page-details .top-of-page-notice .not-editable-realm-field {
     padding-top: 0;
 }
@@ -635,6 +660,13 @@ input[name="licenses"] {
     margin: auto;
 }
 
+#update-invoice-billing-info {
+    display: flex;
+    flex-direction: column;
+    width: 450px;
+    margin: auto;
+}
+
 #upgrade-payment-info .alert {
     grid-area: alert-message;
 }