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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Charge.list.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Charge.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.2.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.3.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.4.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/add_minimum_licenses--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.modify.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.7.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.8.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.3.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.5.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.6.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.7.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Event.list.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.4.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.5.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.pay.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--SetupIntent.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.2.json and b/corporate/tests/stripe_fixtures/attach_discount_to_realm--checkout.Session.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.2.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.3.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/billing_page_permissions--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Event.list.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.void_invoice.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--Invoice.void_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/card_attached_to_customer_but_payment_fails--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.list.1.json and b/corporate/tests/stripe_fixtures/change_plan_tier_from_standard_to_plus--Invoice.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.2.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.3.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.4.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.5.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.6.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.7.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.8.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.9.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.modify.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.10.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.10.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.11.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.11.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.12.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.12.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.13.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.13.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.14.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.14.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.15.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.15.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.16.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.16.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.17.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.17.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.18.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.18.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.7.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.8.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.9.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--Customer.retrieve.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.2.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.3.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.4.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.5.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.6.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.7.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.8.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.9.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.create.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.2.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.3.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.4.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.5.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.6.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.7.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.8.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.9.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.list.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.2.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.3.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.4.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.5.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.6.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.7.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.8.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.9.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--SetupIntent.retrieve.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.2.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.3.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.4.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.5.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.6.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.7.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.8.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.9.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.create.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.2.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.3.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.4.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.5.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.6.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.7.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.8.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.9.json and b/corporate/tests/stripe_fixtures/check_upgrade_parameters--checkout.Session.list.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.2.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.3.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/customer_has_credit_card_as_default_payment_method--checkout.Session.list.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.1.json and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.2.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.list.1.json and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.list.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.void_invoice.1.json and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--Invoice.void_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/downgrade_realm_and_void_open_invoices--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.4.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.5.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.6.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.7.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.8.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.create.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.4.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.5.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.6.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.7.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.8.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.finalize_invoice.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.10.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.10.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.12.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.12.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.13.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.13.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.14.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.14.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.15.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.15.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.3.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.6.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.7.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.8.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.list.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.2.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.pay.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.1.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.2.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.3.json and b/corporate/tests/stripe_fixtures/downgrade_small_realms_behind_on_payments_as_needed--Invoice.void_invoice.3.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/fixed_price_plans--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.1.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.7.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.8.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.list.1.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.2.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.2.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.3.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.4.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_active_legacy_customer--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.2.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.3.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.4.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_not_available_for_ended_legacy_customer--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.7.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Customer.retrieve.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.4.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.5.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.6.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.7.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--Invoice.list.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.3.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--InvoiceItem.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_card--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Event.list.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.3.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.4.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.5.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--Invoice.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/free_trial_upgrade_by_invoice--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.2.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.3.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.4.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_realm_upgrade--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.2.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.3.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.4.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_initial_remote_server_upgrade--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.2.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.3.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_payment_succeeded_event_with_uncaught_exception--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/invoice_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/invoice_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.3.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.4.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.3.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.4.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_plans_as_needed_server--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.create.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_realm_legacy_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/invoice_scheduled_upgrade_server_legacy_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.create.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.2.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.3.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.4.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/migrate_customer_server_to_realms_and_upgrade--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.2.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.3.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.4.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/non_sponsorship_billing--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.modify.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.7.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Customer.retrieve.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.4.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.4.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--Invoice.pay.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.detach.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--PaymentMethod.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.4.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.4.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--SetupIntent.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.4.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.5.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.create.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.2.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.3.json and b/corporate/tests/stripe_fixtures/replace_payment_method--checkout.Session.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.create.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.10.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.10.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.11.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.11.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.12.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.12.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.13.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.13.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.4.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.5.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.6.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.7.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.8.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.9.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.create.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.10.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.10.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.11.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.11.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.12.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.12.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.13.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.13.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.4.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.5.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.6.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.7.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.8.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.9.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.finalize_invoice.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.10.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.10.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.11.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.11.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.12.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.12.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.13.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.13.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.3.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.4.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.5.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.6.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.7.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.8.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.9.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--InvoiceItem.create.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/schedule_fixed_price_plan_upgrade_to_another_fixed_price_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.create.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/schedule_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/schedule_server_legacy_plan_upgrade_to_fixed_price_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/schedule_server_upgrade_to_fixed_price_business_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.create.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/schedule_upgrade_to_fixed_price_annual_business_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/sponsorship_access_for_realms_on_paid_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Configuration.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--billing_portal.Session.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Configuration.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--billing_portal.Session.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_realm--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.3.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Configuration.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.2.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--billing_portal.Session.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/stripe_billing_portal_urls_for_remote_server--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.2.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.3.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.4.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.3.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_annual_plan_to_monthly_plan_for_automatic_license_management--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.4.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.5.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.create.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.4.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.5.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.finalize_invoice.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.4.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_automatic_license_management--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.4.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.3.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/switch_from_monthly_plan_to_annual_plan_for_manual_license_management--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Event.list.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_annual_to_monthly--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Event.list.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/switch_now_free_trial_from_monthly_to_annual--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.create_balance_transaction.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.create_balance_transaction.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/switch_realm_from_standard_to_plus_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.2.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.1.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.6.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.2.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.3.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.3.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.create.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.3.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.finalize_invoice.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.1.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.list.2.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/update_licenses_of_manual_plan_from_billing_page--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Charge.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Charge.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.4.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.5.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Event.list.6.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Charge.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Charge.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.4.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.5.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Event.list.6.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--InvoiceItem.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_card_with_outdated_seat_count--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.2.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.list.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_by_invoice--InvoiceItem.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_by_invoice--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_legacy_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.10.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.10.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.11.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.11.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.12.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.12.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.13.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.13.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.14.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.14.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.15.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.15.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.16.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.16.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.17.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.17.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.18.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.18.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.19.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.19.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.20.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.20.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.21.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.21.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.22.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.22.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.23.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.23.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.24.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.24.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.25.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.25.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.26.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.26.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.27.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.27.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.28.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.28.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.7.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.7.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.8.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.8.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.9.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--Customer.retrieve.9.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_license_counts--checkout.Session.list.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.create.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.create.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.finalize_invoice.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.refresh.1.json differ
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
Binary files /dev/null and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--Invoice.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--InvoiceItem.create.2.json and b/corporate/tests/stripe_fixtures/upgrade_pay_by_invoice--InvoiceItem.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.4.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Event.list.9.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_race_condition_during_card_upgrade--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_remote_realm_user_to_monthly_basic_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_server_user_to_monthly_basic_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_basic_plan_free_trial_remote_server--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.6.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Customer.retrieve.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_business_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Customer.retrieve.5.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.2.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.3.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.4.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Event.list.5.json and /dev/null differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--Invoice.pay.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_user_to_fixed_price_monthly_basic_plan--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.modify.1.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.modify.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.2.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--Customer.retrieve.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.retrieve.1.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--SetupIntent.retrieve.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.create.1.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.list.1.json and b/corporate/tests/stripe_fixtures/upgrade_with_uncaught_exception--checkout.Session.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.1.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.2.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.create.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.1.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.2.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.finalize_invoice.2.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.1.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.3.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.3.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.4.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.4.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.6.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.list.6.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.1.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.1.json differ
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
Binary files a/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.2.json and b/corporate/tests/stripe_fixtures/void_all_open_invoices--Invoice.void_invoice.2.json differ
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 %}
- {% if free_trial_days %}
+ {% if page_params.free_trial_days %}
Start free trial of
{% else %}
Upgrade {{ customer_name }} to
@@ -40,8 +40,14 @@
An invoice
- for $ has been sent to {{email}}.
- To complete the plan upgrade process, please pay the amount due.
+ {% if fixed_price_plan %}
+ for $
+ {% endif %}
+ {% if scheduled_upgrade_invoice_amount_due %}
+ for ${{ scheduled_upgrade_invoice_amount_due }}
+ {% endif %}
+ has been sent to {{email}}.
+ To complete the plan upgrade process, please pay the amount due. Reload this page if already paid.
- {% if free_trial_days %}
+ {% if page_params.free_trial_days %}
- Add a credit card to start your {{ free_trial_days }}-day free trial of
+ Add a credit card to start your {{ page_params.free_trial_days }}-day free trial 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.
{% endif %}
@@ -73,7 +83,7 @@
{% endif %}
- {% if free_trial_days %}
+ {% if page_params.free_trial_days and not page_params.setup_payment_by_invoice %}
{% else %}
@@ -131,7 +141,7 @@
{% endif %}
Due
- {% if free_trial_days %}
+ {% if page_params.free_trial_days %}
on {{ free_trial_end_date }}
{% else %}
today
@@ -163,7 +173,7 @@
$/month off({{ page_params.flat_discounted_months }} {{ "month" if page_params.flat_discounted_months == 1 else "months" }} remaining)
{% endif %}
$
- {% if free_trial_days %}
+ {% if page_params.free_trial_days %}
Your actual bill will depend on the number of
active users in your organization.
{% endif %}
@@ -174,7 +184,7 @@
- {% if free_trial_days %}
+ {% if page_params.free_trial_days %}
{% elif not manual_license_management %}
@@ -194,15 +204,18 @@
Your subscription will renew automatically. You will be able to manage the number of licenses on
- your organization's billing page. You can also
- choose automatic license management instead. See
- here for details.
+ your organization's billing page.
+ {% if not page_params.setup_payment_by_invoice %}
+ You can also choose automatic license management instead.
+ {% endif %}
+ See here for details.
{% endif %}
{% if not is_demo_organization %}
-
- {% if payment_method %}
+
+ {% if page_params.setup_payment_by_invoice %}
+ {% elif payment_method %}
@@ -210,10 +223,12 @@
{% endif %}
-
-
+{% if page_params.setup_payment_by_invoice %}
+
+
+
+
+
+ {% if page_params.free_trial_days %}
+ Start free trial for {{ plan }}
+ {% else %}
+ Send invoice for {{ plan }}
+ {% endif %}
+
+
+
+
+
+ Make sure you have the correct address for the invoice. Please update billing information if you haven't done it yet.
+