diff --git a/README.md b/README.md
index 1e7efa9..8367cec 100644
--- a/README.md
+++ b/README.md
@@ -63,13 +63,22 @@ public function index(BaggageSchemaResolver $schemaResolver)
 Decorate your http client in your service configuration:
 ```yaml
 services:
+  baggage_aware_payment_http_client:
+    class: Macpaw\SchemaContextBundle\HttpClient\BaggageAwareHttpClient
+    decorates: payment_http_client #http client to decorate
+    arguments:
+      - '@baggage_aware_payment_http_client.inner'
+```
+
+### A Note on Testing
+
+If you are replacing or mocking HTTP clients in your test environment, for example, using a library like [`macpaw/extended-mock-http-client`](https://github.com/MacPaw/extended_mock_http_client), you need to disable the `BaggageAwareHttpClient` decoration.
+
+```yaml
+when@test:
+  services:
     baggage_aware_payment_http_client:
       class: Macpaw\SchemaContextBundle\HttpClient\BaggageAwareHttpClient
-      decorates: payment_http_client #http client to decorate
-      arguments:
-        - '@baggage_aware_payment_http_client.inner'
-        - '@Macpaw\SchemaContextBundle\Service\BaggageSchemaResolver'
-        - '@Macpaw\SchemaContextBundle\Service\BaggageCodec'
 ```
 
 ## Messenger Integration
@@ -87,7 +96,7 @@ framework:
     buses:
       messenger.bus.default:
         middleware:
-        - Macpaw\SchemaContextBundle\Messenger\Middleware\BaggageMiddleware
+        - Macpaw\SchemaContextBundle\Messenger\Middleware\BaggageSchemaMiddleware
 ```
 
 ## Testing
diff --git a/config/services.yaml b/config/services.yaml
index 2e4c682..948657d 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -8,6 +8,10 @@ services:
     public: true
     shared: true
 
+  Macpaw\SchemaContextBundle\Service\BaggageCodec:
+    public: true
+    shared: true
+
   Macpaw\SchemaContextBundle\EventListener\BaggageRequestListener:
     arguments:
       $baggageSchemaResolver: '@Macpaw\SchemaContextBundle\Service\BaggageSchemaResolver'
@@ -18,6 +22,6 @@ services:
     tags:
       - { name: kernel.event_subscriber }
 
-  Macpaw\SchemaContextBundle\Messenger\Middleware\BaggageMiddleware:
+  Macpaw\SchemaContextBundle\Messenger\Middleware\BaggageSchemaMiddleware:
     tags:
       - { name: messenger.middleware }