From dd134aa67592ad0e30497df2fa9b6f847c6e9470 Mon Sep 17 00:00:00 2001
From: Stainless Bot <107565488+stainless-bot@users.noreply.github.com>
Date: Thu, 12 Oct 2023 02:43:11 +0100
Subject: [PATCH] refactor(test): refactor authentication tests (#223)

---
 README.md                                     |  44 ++---
 src/modern_treasury/_base_client.py           |   5 +-
 src/modern_treasury/_client.py                |  40 ++---
 src/modern_treasury/_utils/__init__.py        |   3 +
 src/modern_treasury/_utils/_utils.py          |  18 ++
 .../internal_accounts/test_balance_reports.py |  11 +-
 .../api_resources/invoices/test_line_items.py |  11 +-
 .../ledger_transactions/test_versions.py      |  11 +-
 .../payment_orders/test_reversals.py          |  11 +-
 .../test_account_collection_flows.py          |  11 +-
 tests/api_resources/test_account_details.py   |  11 +-
 tests/api_resources/test_connections.py       |  11 +-
 tests/api_resources/test_counterparties.py    |  11 +-
 tests/api_resources/test_documents.py         |  11 +-
 tests/api_resources/test_events.py            |  11 +-
 tests/api_resources/test_expected_payments.py |  11 +-
 tests/api_resources/test_external_accounts.py |  11 +-
 .../test_incoming_payment_details.py          |  11 +-
 tests/api_resources/test_internal_accounts.py |  11 +-
 tests/api_resources/test_invoices.py          |  11 +-
 .../test_ledger_account_balance_monitors.py   |  11 +-
 .../test_ledger_account_categories.py         |  11 +-
 .../test_ledger_account_payouts.py            |  11 +-
 .../test_ledger_account_statements.py         |  11 +-
 tests/api_resources/test_ledger_accounts.py   |  11 +-
 tests/api_resources/test_ledger_entries.py    |  11 +-
 .../test_ledger_event_handlers.py             |  11 +-
 .../api_resources/test_ledger_transactions.py |  11 +-
 tests/api_resources/test_ledgerable_events.py |  11 +-
 tests/api_resources/test_ledgers.py           |  11 +-
 tests/api_resources/test_line_items.py        |  11 +-
 tests/api_resources/test_paper_items.py       |  11 +-
 tests/api_resources/test_payment_flows.py     |  11 +-
 tests/api_resources/test_payment_orders.py    |  11 +-
 .../api_resources/test_payment_references.py  |  11 +-
 tests/api_resources/test_returns.py           |  11 +-
 tests/api_resources/test_routing_details.py   |  11 +-
 tests/api_resources/test_top_level.py         |  11 +-
 tests/api_resources/test_transactions.py      |  11 +-
 tests/api_resources/test_validations.py       |  11 +-
 tests/api_resources/test_virtual_accounts.py  |  11 +-
 tests/api_resources/test_webhooks.py          |  11 +-
 .../transactions/test_line_items.py           |  11 +-
 tests/test_client.py                          | 163 +++++++++++-------
 44 files changed, 381 insertions(+), 310 deletions(-)

diff --git a/README.md b/README.md
index a7357fd2..aa0eb290 100644
--- a/README.md
+++ b/README.md
@@ -35,9 +35,10 @@ The full API of this library can be found in [api.md](https://www.github.com/Mod
 from modern_treasury import ModernTreasury
 
 client = ModernTreasury(
-    # defaults to os.environ.get("MODERN_TREASURY_API_KEY")
-    api_key="my api key",
+    # defaults to os.environ.get("MODERN_TREASURY_ORGANIZATION_ID")
     organization_id="my-organization-ID",
+    # defaults to os.environ.get("MODERN_TREASURY_API_KEY")
+    api_key="My API Key",
 )
 
 external_account = client.external_accounts.create(
@@ -47,8 +48,10 @@ external_account = client.external_accounts.create(
 print(external_account.id)
 ```
 
-While you can provide an `api_key` keyword argument, we recommend using [python-dotenv](https://pypi.org/project/python-dotenv/)
-and adding `MODERN_TREASURY_API_KEY="my api key"` to your `.env` file so that your API Key is not stored in source control.
+While you can provide a `organization_id` keyword argument,
+we recommend using [python-dotenv](https://pypi.org/project/python-dotenv/)
+to add `MODERN_TREASURY_ORGANIZATION_ID="my-organization-ID"` to your `.env` file
+so that your Organization ID is not stored in source control.
 
 ## Async usage
 
@@ -58,9 +61,10 @@ Simply import `AsyncModernTreasury` instead of `ModernTreasury` and use `await`
 from modern_treasury import AsyncModernTreasury
 
 client = AsyncModernTreasury(
-    # defaults to os.environ.get("MODERN_TREASURY_API_KEY")
-    api_key="my api key",
+    # defaults to os.environ.get("MODERN_TREASURY_ORGANIZATION_ID")
     organization_id="my-organization-ID",
+    # defaults to os.environ.get("MODERN_TREASURY_API_KEY")
+    api_key="My API Key",
 )
 
 
@@ -92,9 +96,7 @@ This library provides auto-paginating iterators with each list response, so you
 ```python
 import modern_treasury
 
-client = ModernTreasury(
-    organization_id="my-organization-ID",
-)
+client = ModernTreasury()
 
 all_external_accounts = []
 # Automatically fetches more pages as needed.
@@ -110,9 +112,7 @@ Or, asynchronously:
 import asyncio
 import modern_treasury
 
-client = AsyncModernTreasury(
-    organization_id="my-organization-ID",
-)
+client = AsyncModernTreasury()
 
 
 async def main() -> None:
@@ -157,9 +157,7 @@ Nested parameters are dictionaries, typed using `TypedDict`, for example:
 ```python
 from modern_treasury import ModernTreasury
 
-client = ModernTreasury(
-    organization_id="my-organization-ID",
-)
+client = ModernTreasury()
 
 client.external_accounts.create(
     foo={
@@ -176,9 +174,7 @@ Request parameters that correspond to file uploads can be passed as `bytes` or a
 from pathlib import Path
 from modern_treasury import ModernTreasury
 
-client = ModernTreasury(
-    organization_id="my-organization-ID",
-)
+client = ModernTreasury()
 
 contents = Path("my/file.txt").read_bytes()
 client.documents.create(
@@ -194,9 +190,7 @@ The async client uses the exact same interface. This example uses `aiofiles` to
 import aiofiles
 from modern_treasury import ModernTreasury
 
-client = ModernTreasury(
-    organization_id="my-organization-ID",
-)
+client = ModernTreasury()
 
 async with aiofiles.open("my/file.txt", mode="rb") as f:
     contents = await f.read()
@@ -221,9 +215,7 @@ All errors inherit from `modern_treasury.APIError`.
 import modern_treasury
 from modern_treasury import ModernTreasury
 
-client = ModernTreasury(
-    organization_id="my-organization-ID",
-)
+client = ModernTreasury()
 
 try:
     client.external_accounts.create(
@@ -268,7 +260,6 @@ from modern_treasury import ModernTreasury
 client = ModernTreasury(
     # default is 2
     max_retries=0,
-    organization_id="my-organization-ID",
 )
 
 # Or, configure per-request:
@@ -287,13 +278,11 @@ from modern_treasury import ModernTreasury
 client = ModernTreasury(
     # default is 60s
     timeout=20.0,
-    organization_id="my-organization-ID",
 )
 
 # More granular control:
 client = ModernTreasury(
     timeout=httpx.Timeout(60.0, read=5.0, write=10.0, connect=2.0),
-    organization_id="my-organization-ID",
 )
 
 # Override per-request:
@@ -338,7 +327,6 @@ client = ModernTreasury(
         proxies="http://my.test.proxy.example.com",
         transport=httpx.HTTPTransport(local_address="0.0.0.0"),
     ),
-    organization_id="my-organization-ID",
 )
 ```
 
diff --git a/src/modern_treasury/_base_client.py b/src/modern_treasury/_base_client.py
index 82bf7f3b..b1bb15e8 100644
--- a/src/modern_treasury/_base_client.py
+++ b/src/modern_treasury/_base_client.py
@@ -811,7 +811,10 @@ def close(self) -> None:
 
         The client will *not* be usable after this.
         """
-        self._client.close()
+        # If an error is thrown while constructing a client, self._client
+        # may not be present
+        if hasattr(self, "_client"):
+            self._client.close()
 
     def __enter__(self: _T) -> _T:
         return self
diff --git a/src/modern_treasury/_client.py b/src/modern_treasury/_client.py
index 6fbe7724..8f80ab36 100644
--- a/src/modern_treasury/_client.py
+++ b/src/modern_treasury/_client.py
@@ -92,10 +92,10 @@ class ModernTreasury(SyncAPIClient):
     def __init__(
         self,
         *,
-        organization_id: str | None = None,
-        webhook_key: str | None = None,
+        api_key: str | None = os.environ.get("MODERN_TREASURY_API_KEY", None),
+        organization_id: str | None = os.environ.get("MODERN_TREASURY_ORGANIZATION_ID", None),
+        webhook_key: str | None = os.environ.get("MODERN_TREASURY_WEBHOOK_KEY", None),
         base_url: Optional[str] = None,
-        api_key: Optional[str] = None,
         timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
         max_retries: int = DEFAULT_MAX_RETRIES,
         default_headers: Mapping[str, str] | None = None,
@@ -125,23 +125,19 @@ def __init__(
         - `organization_id` from `MODERN_TREASURY_ORGANIZATION_ID`
         - `webhook_key` from `MODERN_TREASURY_WEBHOOK_KEY`
         """
-        api_key = api_key or os.environ.get("MODERN_TREASURY_API_KEY", None)
-        if not api_key:
+        if api_key is None:
             raise ModernTreasuryError(
                 "The api_key client option must be set either by passing api_key to the client or by setting the MODERN_TREASURY_API_KEY environment variable"
             )
         self.api_key = api_key
 
-        organization_id_envvar = os.environ.get("MODERN_TREASURY_ORGANIZATION_ID", None)
-        organization_id = organization_id or organization_id_envvar or None
         if organization_id is None:
-            raise ValueError(
+            raise ModernTreasuryError(
                 "The organization_id client option must be set either by passing organization_id to the client or by setting the MODERN_TREASURY_ORGANIZATION_ID environment variable"
             )
         self.organization_id = organization_id
 
-        webhook_key_envvar = os.environ.get("MODERN_TREASURY_WEBHOOK_KEY", None)
-        self.webhook_key = webhook_key or webhook_key_envvar or None
+        self.webhook_key = webhook_key
 
         if base_url is None:
             base_url = f"https://app.moderntreasury.com"
@@ -208,9 +204,9 @@ def auth_headers(self) -> dict[str, str]:
     def copy(
         self,
         *,
+        api_key: str | None = None,
         organization_id: str | None = None,
         webhook_key: str | None = None,
-        api_key: str | None = None,
         base_url: str | None = None,
         timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
         http_client: httpx.Client | None = None,
@@ -264,10 +260,10 @@ def copy(
             http_client = http_client or self._client
 
         return self.__class__(
+            api_key=api_key or self.api_key,
             organization_id=organization_id or self.organization_id,
             webhook_key=webhook_key or self.webhook_key,
             base_url=base_url or str(self.base_url),
-            api_key=api_key or self.api_key,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
             connection_pool_limits=connection_pool_limits,
@@ -387,10 +383,10 @@ class AsyncModernTreasury(AsyncAPIClient):
     def __init__(
         self,
         *,
-        organization_id: str | None = None,
-        webhook_key: str | None = None,
+        api_key: str | None = os.environ.get("MODERN_TREASURY_API_KEY", None),
+        organization_id: str | None = os.environ.get("MODERN_TREASURY_ORGANIZATION_ID", None),
+        webhook_key: str | None = os.environ.get("MODERN_TREASURY_WEBHOOK_KEY", None),
         base_url: Optional[str] = None,
-        api_key: Optional[str] = None,
         timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
         max_retries: int = DEFAULT_MAX_RETRIES,
         default_headers: Mapping[str, str] | None = None,
@@ -420,23 +416,19 @@ def __init__(
         - `organization_id` from `MODERN_TREASURY_ORGANIZATION_ID`
         - `webhook_key` from `MODERN_TREASURY_WEBHOOK_KEY`
         """
-        api_key = api_key or os.environ.get("MODERN_TREASURY_API_KEY", None)
-        if not api_key:
+        if api_key is None:
             raise ModernTreasuryError(
                 "The api_key client option must be set either by passing api_key to the client or by setting the MODERN_TREASURY_API_KEY environment variable"
             )
         self.api_key = api_key
 
-        organization_id_envvar = os.environ.get("MODERN_TREASURY_ORGANIZATION_ID", None)
-        organization_id = organization_id or organization_id_envvar or None
         if organization_id is None:
-            raise ValueError(
+            raise ModernTreasuryError(
                 "The organization_id client option must be set either by passing organization_id to the client or by setting the MODERN_TREASURY_ORGANIZATION_ID environment variable"
             )
         self.organization_id = organization_id
 
-        webhook_key_envvar = os.environ.get("MODERN_TREASURY_WEBHOOK_KEY", None)
-        self.webhook_key = webhook_key or webhook_key_envvar or None
+        self.webhook_key = webhook_key
 
         if base_url is None:
             base_url = f"https://app.moderntreasury.com"
@@ -503,9 +495,9 @@ def auth_headers(self) -> dict[str, str]:
     def copy(
         self,
         *,
+        api_key: str | None = None,
         organization_id: str | None = None,
         webhook_key: str | None = None,
-        api_key: str | None = None,
         base_url: str | None = None,
         timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
         http_client: httpx.AsyncClient | None = None,
@@ -559,10 +551,10 @@ def copy(
             http_client = http_client or self._client
 
         return self.__class__(
+            api_key=api_key or self.api_key,
             organization_id=organization_id or self.organization_id,
             webhook_key=webhook_key or self.webhook_key,
             base_url=base_url or str(self.base_url),
-            api_key=api_key or self.api_key,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
             connection_pool_limits=connection_pool_limits,
diff --git a/src/modern_treasury/_utils/__init__.py b/src/modern_treasury/_utils/__init__.py
index 679193bd..6d13a362 100644
--- a/src/modern_treasury/_utils/__init__.py
+++ b/src/modern_treasury/_utils/__init__.py
@@ -21,6 +21,9 @@
 from ._utils import extract_type_arg as extract_type_arg
 from ._utils import is_required_type as is_required_type
 from ._utils import is_annotated_type as is_annotated_type
+from ._utils import maybe_coerce_float as maybe_coerce_float
+from ._utils import maybe_coerce_boolean as maybe_coerce_boolean
+from ._utils import maybe_coerce_integer as maybe_coerce_integer
 from ._utils import strip_annotated_type as strip_annotated_type
 from ._transform import PropertyInfo as PropertyInfo
 from ._transform import transform as transform
diff --git a/src/modern_treasury/_utils/_utils.py b/src/modern_treasury/_utils/_utils.py
index 603f7c10..e43ef6f8 100644
--- a/src/modern_treasury/_utils/_utils.py
+++ b/src/modern_treasury/_utils/_utils.py
@@ -309,6 +309,24 @@ def coerce_boolean(val: str) -> bool:
     return val == "true" or val == "1" or val == "on"
 
 
+def maybe_coerce_integer(val: str | None) -> int | None:
+    if val is None:
+        return None
+    return coerce_integer(val)
+
+
+def maybe_coerce_float(val: str | None) -> float | None:
+    if val is None:
+        return None
+    return coerce_float(val)
+
+
+def maybe_coerce_boolean(val: str | None) -> bool | None:
+    if val is None:
+        return None
+    return coerce_boolean(val)
+
+
 def removeprefix(string: str, prefix: str) -> str:
     """Remove a prefix from a string.
 
diff --git a/tests/api_resources/internal_accounts/test_balance_reports.py b/tests/api_resources/internal_accounts/test_balance_reports.py
index 1e4d923b..98dcf966 100644
--- a/tests/api_resources/internal_accounts/test_balance_reports.py
+++ b/tests/api_resources/internal_accounts/test_balance_reports.py
@@ -13,15 +13,16 @@
 from modern_treasury.types.internal_accounts import BalanceReport
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestBalanceReports:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -54,10 +55,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncBalanceReports:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/invoices/test_line_items.py b/tests/api_resources/invoices/test_line_items.py
index 95e59468..b438a52a 100644
--- a/tests/api_resources/invoices/test_line_items.py
+++ b/tests/api_resources/invoices/test_line_items.py
@@ -12,15 +12,16 @@
 from modern_treasury.types.invoices import InvoiceLineItem
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLineItems:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -101,10 +102,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncLineItems:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/ledger_transactions/test_versions.py b/tests/api_resources/ledger_transactions/test_versions.py
index e52287ee..3b7c67a7 100644
--- a/tests/api_resources/ledger_transactions/test_versions.py
+++ b/tests/api_resources/ledger_transactions/test_versions.py
@@ -13,15 +13,16 @@
 from modern_treasury.types.ledger_transactions import LedgerTransactionVersion
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestVersions:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -45,10 +46,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncVersions:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/payment_orders/test_reversals.py b/tests/api_resources/payment_orders/test_reversals.py
index a5718a8d..a64b409a 100644
--- a/tests/api_resources/payment_orders/test_reversals.py
+++ b/tests/api_resources/payment_orders/test_reversals.py
@@ -13,15 +13,16 @@
 from modern_treasury.types.payment_orders import Reversal
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestReversals:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -134,10 +135,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncReversals:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_account_collection_flows.py b/tests/api_resources/test_account_collection_flows.py
index f07cf8ee..e0d3d037 100644
--- a/tests/api_resources/test_account_collection_flows.py
+++ b/tests/api_resources/test_account_collection_flows.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestAccountCollectionFlows:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -76,10 +77,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncAccountCollectionFlows:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_account_details.py b/tests/api_resources/test_account_details.py
index 88da49c2..fc907ba7 100644
--- a/tests/api_resources/test_account_details.py
+++ b/tests/api_resources/test_account_details.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestAccountDetails:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -82,10 +83,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncAccountDetails:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_connections.py b/tests/api_resources/test_connections.py
index 30e7940d..a244c7a7 100644
--- a/tests/api_resources/test_connections.py
+++ b/tests/api_resources/test_connections.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestConnections:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -42,10 +43,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncConnections:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_counterparties.py b/tests/api_resources/test_counterparties.py
index 2b54a6b8..2a6620c7 100644
--- a/tests/api_resources/test_counterparties.py
+++ b/tests/api_resources/test_counterparties.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestCounterparties:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -368,10 +369,10 @@ def test_method_collect_account_with_all_params(self, client: ModernTreasury) ->
 
 class TestAsyncCounterparties:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_documents.py b/tests/api_resources/test_documents.py
index 8aeb1fee..e99bcfdf 100644
--- a/tests/api_resources/test_documents.py
+++ b/tests/api_resources/test_documents.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestDocuments:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -68,10 +69,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncDocuments:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_events.py b/tests/api_resources/test_events.py
index effd2367..c6ed8168 100644
--- a/tests/api_resources/test_events.py
+++ b/tests/api_resources/test_events.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestEvents:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -53,10 +54,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncEvents:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_expected_payments.py b/tests/api_resources/test_expected_payments.py
index 64dbbfea..c71c7e06 100644
--- a/tests/api_resources/test_expected_payments.py
+++ b/tests/api_resources/test_expected_payments.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestExpectedPayments:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -163,10 +164,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncExpectedPayments:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_external_accounts.py b/tests/api_resources/test_external_accounts.py
index 36f05018..9c447f4b 100644
--- a/tests/api_resources/test_external_accounts.py
+++ b/tests/api_resources/test_external_accounts.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestExternalAccounts:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -212,10 +213,10 @@ def test_method_verify_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncExternalAccounts:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_incoming_payment_details.py b/tests/api_resources/test_incoming_payment_details.py
index 3da1a082..22b8092a 100644
--- a/tests/api_resources/test_incoming_payment_details.py
+++ b/tests/api_resources/test_incoming_payment_details.py
@@ -14,15 +14,16 @@
 from modern_treasury.types.shared import AsyncResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestIncomingPaymentDetails:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -90,10 +91,10 @@ def test_method_create_async_with_all_params(self, client: ModernTreasury) -> No
 
 class TestAsyncIncomingPaymentDetails:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_internal_accounts.py b/tests/api_resources/test_internal_accounts.py
index efbd0f54..762edd3e 100644
--- a/tests/api_resources/test_internal_accounts.py
+++ b/tests/api_resources/test_internal_accounts.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestInternalAccounts:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -105,10 +106,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncInternalAccounts:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_invoices.py b/tests/api_resources/test_invoices.py
index cbb88757..276d971c 100644
--- a/tests/api_resources/test_invoices.py
+++ b/tests/api_resources/test_invoices.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestInvoices:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -226,10 +227,10 @@ def test_method_add_payment_order(self, client: ModernTreasury) -> None:
 
 class TestAsyncInvoices:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_account_balance_monitors.py b/tests/api_resources/test_ledger_account_balance_monitors.py
index c7a4c526..1e96bd1d 100644
--- a/tests/api_resources/test_ledger_account_balance_monitors.py
+++ b/tests/api_resources/test_ledger_account_balance_monitors.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerAccountBalanceMonitors:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -107,10 +108,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerAccountBalanceMonitors:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_account_categories.py b/tests/api_resources/test_ledger_account_categories.py
index 65bc5b21..6de3ef64 100644
--- a/tests/api_resources/test_ledger_account_categories.py
+++ b/tests/api_resources/test_ledger_account_categories.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerAccountCategories:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -153,10 +154,10 @@ def test_method_remove_nested_category(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerAccountCategories:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_account_payouts.py b/tests/api_resources/test_ledger_account_payouts.py
index e8a16dd0..f56239b9 100644
--- a/tests/api_resources/test_ledger_account_payouts.py
+++ b/tests/api_resources/test_ledger_account_payouts.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerAccountPayouts:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -104,10 +105,10 @@ def test_method_retireve(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerAccountPayouts:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_account_statements.py b/tests/api_resources/test_ledger_account_statements.py
index fa887893..cdb64ebc 100644
--- a/tests/api_resources/test_ledger_account_statements.py
+++ b/tests/api_resources/test_ledger_account_statements.py
@@ -14,15 +14,16 @@
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerAccountStatements:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -62,10 +63,10 @@ def test_method_retrieve(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerAccountStatements:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_accounts.py b/tests/api_resources/test_ledger_accounts.py
index 64da56b7..6ba5e91e 100644
--- a/tests/api_resources/test_ledger_accounts.py
+++ b/tests/api_resources/test_ledger_accounts.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerAccounts:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -157,10 +158,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerAccounts:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_entries.py b/tests/api_resources/test_ledger_entries.py
index 9371811f..1a433d0c 100644
--- a/tests/api_resources/test_ledger_entries.py
+++ b/tests/api_resources/test_ledger_entries.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerEntries:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -76,10 +77,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerEntries:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_event_handlers.py b/tests/api_resources/test_ledger_event_handlers.py
index 285c8139..33611b1a 100644
--- a/tests/api_resources/test_ledger_event_handlers.py
+++ b/tests/api_resources/test_ledger_event_handlers.py
@@ -18,15 +18,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerEventHandlers:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -141,10 +142,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerEventHandlers:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledger_transactions.py b/tests/api_resources/test_ledger_transactions.py
index ea8f28dc..6df526cd 100644
--- a/tests/api_resources/test_ledger_transactions.py
+++ b/tests/api_resources/test_ledger_transactions.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerTransactions:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -249,10 +250,10 @@ def test_method_create_reversal_with_all_params(self, client: ModernTreasury) ->
 
 class TestAsyncLedgerTransactions:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledgerable_events.py b/tests/api_resources/test_ledgerable_events.py
index 744dcff7..792d55c9 100644
--- a/tests/api_resources/test_ledgerable_events.py
+++ b/tests/api_resources/test_ledgerable_events.py
@@ -11,15 +11,16 @@
 from modern_treasury.types import LedgerableEvent
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgerableEvents:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -59,10 +60,10 @@ def test_method_retrieve(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgerableEvents:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_ledgers.py b/tests/api_resources/test_ledgers.py
index 676b877b..35e3acb8 100644
--- a/tests/api_resources/test_ledgers.py
+++ b/tests/api_resources/test_ledgers.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLedgers:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -99,10 +100,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncLedgers:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_line_items.py b/tests/api_resources/test_line_items.py
index f7afe7fa..0f68858c 100644
--- a/tests/api_resources/test_line_items.py
+++ b/tests/api_resources/test_line_items.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLineItems:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -79,10 +80,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncLineItems:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_paper_items.py b/tests/api_resources/test_paper_items.py
index 83aca023..ac3405b7 100644
--- a/tests/api_resources/test_paper_items.py
+++ b/tests/api_resources/test_paper_items.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestPaperItems:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -51,10 +52,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncPaperItems:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_payment_flows.py b/tests/api_resources/test_payment_flows.py
index f066979b..a28db006 100644
--- a/tests/api_resources/test_payment_flows.py
+++ b/tests/api_resources/test_payment_flows.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestPaymentFlows:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -85,10 +86,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncPaymentFlows:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_payment_orders.py b/tests/api_resources/test_payment_orders.py
index c9574831..d00e2a78 100644
--- a/tests/api_resources/test_payment_orders.py
+++ b/tests/api_resources/test_payment_orders.py
@@ -14,15 +14,16 @@
 from modern_treasury.types.shared import AsyncResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestPaymentOrders:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -701,10 +702,10 @@ def test_method_create_async_with_all_params(self, client: ModernTreasury) -> No
 
 class TestAsyncPaymentOrders:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_payment_references.py b/tests/api_resources/test_payment_references.py
index f2a54bf7..54c61966 100644
--- a/tests/api_resources/test_payment_references.py
+++ b/tests/api_resources/test_payment_references.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestPaymentReferences:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -58,10 +59,10 @@ def test_method_retireve(self, client: ModernTreasury) -> None:
 
 class TestAsyncPaymentReferences:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_returns.py b/tests/api_resources/test_returns.py
index 4c5b2466..191eaa15 100644
--- a/tests/api_resources/test_returns.py
+++ b/tests/api_resources/test_returns.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestReturns:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -72,10 +73,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncReturns:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_routing_details.py b/tests/api_resources/test_routing_details.py
index 656e8e62..96bd0109 100644
--- a/tests/api_resources/test_routing_details.py
+++ b/tests/api_resources/test_routing_details.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestRoutingDetails:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -84,10 +85,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncRoutingDetails:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_top_level.py b/tests/api_resources/test_top_level.py
index be9700fc..3849d1be 100644
--- a/tests/api_resources/test_top_level.py
+++ b/tests/api_resources/test_top_level.py
@@ -11,15 +11,16 @@
 from modern_treasury.types import PingResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestTopLevel:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -31,10 +32,10 @@ def test_method_ping(self, client: ModernTreasury) -> None:
 
 class TestAsyncTopLevel:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_transactions.py b/tests/api_resources/test_transactions.py
index 1841292e..34788cc9 100644
--- a/tests/api_resources/test_transactions.py
+++ b/tests/api_resources/test_transactions.py
@@ -13,15 +13,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestTransactions:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -75,10 +76,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncTransactions:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_validations.py b/tests/api_resources/test_validations.py
index 5859c17d..dcfb56d8 100644
--- a/tests/api_resources/test_validations.py
+++ b/tests/api_resources/test_validations.py
@@ -11,15 +11,16 @@
 from modern_treasury.types import RoutingNumberLookupRequest
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestValidations:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -34,10 +35,10 @@ def test_method_validate_routing_number(self, client: ModernTreasury) -> None:
 
 class TestAsyncValidations:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_virtual_accounts.py b/tests/api_resources/test_virtual_accounts.py
index ff9c7bd0..390b27c2 100644
--- a/tests/api_resources/test_virtual_accounts.py
+++ b/tests/api_resources/test_virtual_accounts.py
@@ -12,15 +12,16 @@
 from modern_treasury.pagination import SyncPage, AsyncPage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestVirtualAccounts:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -126,10 +127,10 @@ def test_method_delete(self, client: ModernTreasury) -> None:
 
 class TestAsyncVirtualAccounts:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/test_webhooks.py b/tests/api_resources/test_webhooks.py
index 83f0149a..ff34641f 100644
--- a/tests/api_resources/test_webhooks.py
+++ b/tests/api_resources/test_webhooks.py
@@ -10,15 +10,16 @@
 from modern_treasury import ModernTreasury, AsyncModernTreasury
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestWebhooks:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -120,10 +121,10 @@ def get(self, key: str) -> str | None:
 
 class TestAsyncWebhooks:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/api_resources/transactions/test_line_items.py b/tests/api_resources/transactions/test_line_items.py
index cdbbb0b8..c38b1b1b 100644
--- a/tests/api_resources/transactions/test_line_items.py
+++ b/tests/api_resources/transactions/test_line_items.py
@@ -12,15 +12,16 @@
 from modern_treasury.types.transactions import TransactionLineItem
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 class TestLineItems:
     strict_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
@@ -50,10 +51,10 @@ def test_method_list_with_all_params(self, client: ModernTreasury) -> None:
 
 class TestAsyncLineItems:
     strict_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
     loose_client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
     )
     parametrize = pytest.mark.parametrize("client", [strict_client, loose_client], ids=["strict", "loose"])
 
diff --git a/tests/test_client.py b/tests/test_client.py
index 3ef2bf86..bdb9e658 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -29,7 +29,8 @@
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-api_key = os.environ.get("API_KEY", "something1234")
+api_key = "My API Key"
+organization_id = "my-organization-ID"
 
 
 def _get_params(client: BaseClient) -> dict[str, str]:
@@ -40,7 +41,7 @@ def _get_params(client: BaseClient) -> dict[str, str]:
 
 class TestModernTreasury:
     client = ModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
 
     @pytest.mark.respx(base_url=base_url)
@@ -56,12 +57,13 @@ def test_copy(self) -> None:
         copied = self.client.copy()
         assert id(copied) != id(self.client)
 
-        copied = self.client.copy(api_key="my new api key")
-        assert copied.api_key == "my new api key"
-        assert self.client.api_key == api_key
+        copied = self.client.copy(api_key="another My API Key")
+        assert copied.api_key == "another My API Key"
+        assert self.client.api_key == "My API Key"
 
-        copied = self.client.copy(organization_id="my-organization-ID")
-        assert copied.organization_id == "my-organization-ID"
+        copied = self.client.copy(organization_id="another my-organization-ID")
+        assert copied.organization_id == "another my-organization-ID"
+        assert self.client.organization_id == "my-organization-ID"
 
     def test_copy_default_options(self) -> None:
         # options that have a default are overridden correctly
@@ -83,8 +85,8 @@ def test_copy_default_headers(self) -> None:
         client = ModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_headers={"X-Foo": "bar"},
         )
         assert client.default_headers["X-Foo"] == "bar"
@@ -121,8 +123,8 @@ def test_copy_default_query(self) -> None:
         client = ModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_query={"foo": "bar"},
         )
         assert _get_params(client)["foo"] == "bar"
@@ -188,8 +190,8 @@ def test_client_timeout_option(self) -> None:
         client = ModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             timeout=httpx.Timeout(0),
         )
 
@@ -203,8 +205,8 @@ def test_http_client_timeout_option(self) -> None:
             client = ModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=http_client,
             )
 
@@ -217,8 +219,8 @@ def test_http_client_timeout_option(self) -> None:
             client = ModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=http_client,
             )
 
@@ -231,8 +233,8 @@ def test_http_client_timeout_option(self) -> None:
             client = ModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=http_client,
             )
 
@@ -244,8 +246,8 @@ def test_default_headers_option(self) -> None:
         client = ModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_headers={"X-Foo": "bar"},
         )
         request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
@@ -255,8 +257,8 @@ def test_default_headers_option(self) -> None:
         client2 = ModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_headers={
                 "X-Foo": "stainless",
                 "X-Stainless-Lang": "my-overriding-header",
@@ -266,12 +268,25 @@ def test_default_headers_option(self) -> None:
         assert request.headers.get("x-foo") == "stainless"
         assert request.headers.get("x-stainless-lang") == "my-overriding-header"
 
+    def test_validate_headers(self) -> None:
+        client = ModernTreasury(
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
+        )
+        request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
+        assert "Basic" in request.headers.get("Authorization")
+
+        with pytest.raises(Exception):
+            client2 = ModernTreasury(
+                base_url=base_url, api_key=None, organization_id=None, _strict_response_validation=True
+            )
+            _ = client2
+
     def test_default_query_option(self) -> None:
         client = ModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_query={"query_param": "bar"},
         )
         request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
@@ -458,14 +473,14 @@ def test_idempotency_header_options(self, respx_mock: MockRouter) -> None:
             ModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
             ),
             ModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=httpx.Client(),
             ),
         ],
@@ -487,14 +502,14 @@ def test_base_url_trailing_slash(self, client: ModernTreasury) -> None:
             ModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
             ),
             ModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=httpx.Client(),
             ),
         ],
@@ -516,14 +531,14 @@ def test_base_url_no_trailing_slash(self, client: ModernTreasury) -> None:
             ModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
             ),
             ModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=httpx.Client(),
             ),
         ],
@@ -549,8 +564,8 @@ def test_transport_option_is_deprecated(self) -> None:
             client = ModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 transport=transport,
             )
 
@@ -563,8 +578,8 @@ def test_transport_option_mutually_exclusive_with_http_client(self) -> None:
                     ModernTreasury(
                         base_url=base_url,
                         api_key=api_key,
+                        organization_id=organization_id,
                         _strict_response_validation=True,
-                        organization_id="my-organization-ID",
                         transport=httpx.MockTransport(lambda: None),
                         http_client=http_client,
                     )
@@ -581,8 +596,8 @@ def test_connection_pool_limits_option_is_deprecated(self) -> None:
             client = ModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 connection_pool_limits=connection_pool_limits,
             )
 
@@ -600,8 +615,8 @@ def test_connection_pool_limits_option_mutually_exclusive_with_http_client(self)
                     ModernTreasury(
                         base_url=base_url,
                         api_key=api_key,
+                        organization_id=organization_id,
                         _strict_response_validation=True,
-                        organization_id="my-organization-ID",
                         connection_pool_limits=httpx.Limits(
                             max_connections=101, max_keepalive_connections=76, keepalive_expiry=23
                         ),
@@ -618,8 +633,8 @@ def test_proxies_option_is_deprecated(self) -> None:
             client = ModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 proxies=proxies,
             )
 
@@ -636,15 +651,15 @@ def test_proxies_option_mutually_exclusive_with_http_client(self) -> None:
                     ModernTreasury(
                         base_url=base_url,
                         api_key=api_key,
+                        organization_id=organization_id,
                         _strict_response_validation=True,
-                        organization_id="my-organization-ID",
                         proxies="https://www.example.com/proxy",
                         http_client=http_client,
                     )
 
     def test_client_del(self) -> None:
         client = ModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
         assert not client.is_closed()
 
@@ -654,7 +669,7 @@ def test_client_del(self) -> None:
 
     def test_copied_client_does_not_close_http(self) -> None:
         client = ModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
         assert not client.is_closed()
 
@@ -668,7 +683,7 @@ def test_copied_client_does_not_close_http(self) -> None:
 
     def test_client_context_manager(self) -> None:
         client = ModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
         with client as c2:
             assert c2 is client
@@ -696,14 +711,14 @@ class Model(BaseModel):
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, text="my-custom-format"))
 
         strict_client = ModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
 
         with pytest.raises(APIResponseValidationError):
             strict_client.get("/foo", cast_to=Model)
 
         client = ModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
         )
 
         response = client.get("/foo", cast_to=Model)
@@ -730,7 +745,7 @@ class Model(BaseModel):
     @mock.patch("time.time", mock.MagicMock(return_value=1696004797))
     def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str, timeout: float) -> None:
         client = ModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
 
         headers = httpx.Headers({"retry-after": retry_after})
@@ -741,7 +756,7 @@ def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str
 
 class TestAsyncModernTreasury:
     client = AsyncModernTreasury(
-        base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+        base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
     )
 
     @pytest.mark.respx(base_url=base_url)
@@ -758,12 +773,13 @@ def test_copy(self) -> None:
         copied = self.client.copy()
         assert id(copied) != id(self.client)
 
-        copied = self.client.copy(api_key="my new api key")
-        assert copied.api_key == "my new api key"
-        assert self.client.api_key == api_key
+        copied = self.client.copy(api_key="another My API Key")
+        assert copied.api_key == "another My API Key"
+        assert self.client.api_key == "My API Key"
 
-        copied = self.client.copy(organization_id="my-organization-ID")
-        assert copied.organization_id == "my-organization-ID"
+        copied = self.client.copy(organization_id="another my-organization-ID")
+        assert copied.organization_id == "another my-organization-ID"
+        assert self.client.organization_id == "my-organization-ID"
 
     def test_copy_default_options(self) -> None:
         # options that have a default are overridden correctly
@@ -785,8 +801,8 @@ def test_copy_default_headers(self) -> None:
         client = AsyncModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_headers={"X-Foo": "bar"},
         )
         assert client.default_headers["X-Foo"] == "bar"
@@ -823,8 +839,8 @@ def test_copy_default_query(self) -> None:
         client = AsyncModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_query={"foo": "bar"},
         )
         assert _get_params(client)["foo"] == "bar"
@@ -890,8 +906,8 @@ async def test_client_timeout_option(self) -> None:
         client = AsyncModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             timeout=httpx.Timeout(0),
         )
 
@@ -905,8 +921,8 @@ async def test_http_client_timeout_option(self) -> None:
             client = AsyncModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=http_client,
             )
 
@@ -919,8 +935,8 @@ async def test_http_client_timeout_option(self) -> None:
             client = AsyncModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=http_client,
             )
 
@@ -933,8 +949,8 @@ async def test_http_client_timeout_option(self) -> None:
             client = AsyncModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=http_client,
             )
 
@@ -946,8 +962,8 @@ def test_default_headers_option(self) -> None:
         client = AsyncModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_headers={"X-Foo": "bar"},
         )
         request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
@@ -957,8 +973,8 @@ def test_default_headers_option(self) -> None:
         client2 = AsyncModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_headers={
                 "X-Foo": "stainless",
                 "X-Stainless-Lang": "my-overriding-header",
@@ -968,12 +984,25 @@ def test_default_headers_option(self) -> None:
         assert request.headers.get("x-foo") == "stainless"
         assert request.headers.get("x-stainless-lang") == "my-overriding-header"
 
+    def test_validate_headers(self) -> None:
+        client = AsyncModernTreasury(
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
+        )
+        request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
+        assert "Basic" in request.headers.get("Authorization")
+
+        with pytest.raises(Exception):
+            client2 = AsyncModernTreasury(
+                base_url=base_url, api_key=None, organization_id=None, _strict_response_validation=True
+            )
+            _ = client2
+
     def test_default_query_option(self) -> None:
         client = AsyncModernTreasury(
             base_url=base_url,
             api_key=api_key,
+            organization_id=organization_id,
             _strict_response_validation=True,
-            organization_id="my-organization-ID",
             default_query={"query_param": "bar"},
         )
         request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
@@ -1160,14 +1189,14 @@ async def test_idempotency_header_options(self, respx_mock: MockRouter) -> None:
             AsyncModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
             ),
             AsyncModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=httpx.AsyncClient(),
             ),
         ],
@@ -1189,14 +1218,14 @@ def test_base_url_trailing_slash(self, client: AsyncModernTreasury) -> None:
             AsyncModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
             ),
             AsyncModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=httpx.AsyncClient(),
             ),
         ],
@@ -1218,14 +1247,14 @@ def test_base_url_no_trailing_slash(self, client: AsyncModernTreasury) -> None:
             AsyncModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
             ),
             AsyncModernTreasury(
                 base_url="http://localhost:5000/custom/path/",
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 http_client=httpx.AsyncClient(),
             ),
         ],
@@ -1251,8 +1280,8 @@ def test_transport_option_is_deprecated(self) -> None:
             client = AsyncModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 transport=transport,
             )
 
@@ -1265,8 +1294,8 @@ async def test_transport_option_mutually_exclusive_with_http_client(self) -> Non
                     AsyncModernTreasury(
                         base_url=base_url,
                         api_key=api_key,
+                        organization_id=organization_id,
                         _strict_response_validation=True,
-                        organization_id="my-organization-ID",
                         transport=httpx.MockTransport(lambda: None),
                         http_client=http_client,
                     )
@@ -1283,8 +1312,8 @@ def test_connection_pool_limits_option_is_deprecated(self) -> None:
             client = AsyncModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 connection_pool_limits=connection_pool_limits,
             )
 
@@ -1302,8 +1331,8 @@ async def test_connection_pool_limits_option_mutually_exclusive_with_http_client
                     AsyncModernTreasury(
                         base_url=base_url,
                         api_key=api_key,
+                        organization_id=organization_id,
                         _strict_response_validation=True,
-                        organization_id="my-organization-ID",
                         connection_pool_limits=httpx.Limits(
                             max_connections=101, max_keepalive_connections=76, keepalive_expiry=23
                         ),
@@ -1320,8 +1349,8 @@ def test_proxies_option_is_deprecated(self) -> None:
             client = AsyncModernTreasury(
                 base_url=base_url,
                 api_key=api_key,
+                organization_id=organization_id,
                 _strict_response_validation=True,
-                organization_id="my-organization-ID",
                 proxies=proxies,
             )
 
@@ -1338,15 +1367,15 @@ async def test_proxies_option_mutually_exclusive_with_http_client(self) -> None:
                     AsyncModernTreasury(
                         base_url=base_url,
                         api_key=api_key,
+                        organization_id=organization_id,
                         _strict_response_validation=True,
-                        organization_id="my-organization-ID",
                         proxies="https://www.example.com/proxy",
                         http_client=http_client,
                     )
 
     async def test_client_del(self) -> None:
         client = AsyncModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
         assert not client.is_closed()
 
@@ -1357,7 +1386,7 @@ async def test_client_del(self) -> None:
 
     async def test_copied_client_does_not_close_http(self) -> None:
         client = AsyncModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
         assert not client.is_closed()
 
@@ -1372,7 +1401,7 @@ async def test_copied_client_does_not_close_http(self) -> None:
 
     async def test_client_context_manager(self) -> None:
         client = AsyncModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
         async with client as c2:
             assert c2 is client
@@ -1402,14 +1431,14 @@ class Model(BaseModel):
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, text="my-custom-format"))
 
         strict_client = AsyncModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
 
         with pytest.raises(APIResponseValidationError):
             await strict_client.get("/foo", cast_to=Model)
 
         client = AsyncModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=False, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=False
         )
 
         response = await client.get("/foo", cast_to=Model)
@@ -1437,7 +1466,7 @@ class Model(BaseModel):
     @pytest.mark.asyncio
     async def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str, timeout: float) -> None:
         client = AsyncModernTreasury(
-            base_url=base_url, api_key=api_key, _strict_response_validation=True, organization_id="my-organization-ID"
+            base_url=base_url, api_key=api_key, organization_id=organization_id, _strict_response_validation=True
         )
 
         headers = httpx.Headers({"retry-after": retry_after})