diff --git a/src/Mollie.Api/Client/Abstract/IBalanceClient.cs b/src/Mollie.Api/Client/Abstract/IBalanceClient.cs
index 952c3149..ecfa31b4 100644
--- a/src/Mollie.Api/Client/Abstract/IBalanceClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IBalanceClient.cs
@@ -7,7 +7,7 @@
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IBalanceClient : IDisposable {
+    public interface IBalanceClient : IBaseMollieClient {
         Task<BalanceResponse> GetBalanceAsync(string balanceId);
         Task<BalanceResponse> GetBalanceAsync(UrlObjectLink<BalanceResponse> url);
         Task<BalanceResponse> GetPrimaryBalanceAsync();
diff --git a/src/Mollie.Api/Client/Abstract/ICaptureClient.cs b/src/Mollie.Api/Client/Abstract/ICaptureClient.cs
index 0fd49447..ce8d8db3 100644
--- a/src/Mollie.Api/Client/Abstract/ICaptureClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ICaptureClient.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Capture;
 using Mollie.Api.Models.Capture.Request;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface ICaptureClient : IDisposable {
+    public interface ICaptureClient : IBaseMollieClient {
         Task<CaptureResponse> GetCaptureAsync(string paymentId, string captureId, bool testmode = false);
         Task<CaptureResponse> GetCaptureAsync(UrlObjectLink<CaptureResponse> url);
         Task<ListResponse<CaptureResponse>> GetCapturesListAsync(string paymentId, bool testmode = false);
diff --git a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs b/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs
index 9e676b1c..0db8ad3e 100644
--- a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.Chargeback;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IChargebacksClient : IDisposable {
+    public interface IChargebacksClient : IBaseMollieClient {
         Task<ChargebackResponse> GetChargebackAsync(string paymentId, string chargebackId, bool testmode = false);
         Task<ListResponse<ChargebackResponse>> GetChargebacksListAsync(string paymentId, string from = null, int? limit = null, bool testmode = false);
         Task<ListResponse<ChargebackResponse>> GetChargebacksListAsync(string profileId = null, bool testmode = false);
diff --git a/src/Mollie.Api/Client/Abstract/ICustomerClient.cs b/src/Mollie.Api/Client/Abstract/ICustomerClient.cs
index 70e848ff..4bbddffa 100644
--- a/src/Mollie.Api/Client/Abstract/ICustomerClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ICustomerClient.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Payment.Request;
@@ -7,7 +6,7 @@
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface ICustomerClient : IDisposable {
+    public interface ICustomerClient : IBaseMollieClient {
         Task<CustomerResponse> CreateCustomerAsync(CustomerRequest request);
         Task<CustomerResponse> UpdateCustomerAsync(string customerId, CustomerRequest request);
         Task DeleteCustomerAsync(string customerId, bool testmode = false);
diff --git a/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs b/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs
index b99d9981..ca69b014 100644
--- a/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.Invoice;
 using Mollie.Api.Models.List;
 
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IInvoicesClient : IDisposable {
+    public interface IInvoicesClient : IBaseMollieClient {
         Task<InvoiceResponse> GetInvoiceAsync(string invoiceId);
         Task<InvoiceResponse> GetInvoiceAsync(UrlObjectLink<InvoiceResponse> url);
         Task<ListResponse<InvoiceResponse>> GetInvoiceListAsync(
diff --git a/src/Mollie.Api/Client/Abstract/IMandateClient.cs b/src/Mollie.Api/Client/Abstract/IMandateClient.cs
index 9ea03015..7dcebee6 100644
--- a/src/Mollie.Api/Client/Abstract/IMandateClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IMandateClient.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IMandateClient : IDisposable {
+    public interface IMandateClient : IBaseMollieClient {
         Task<MandateResponse> GetMandateAsync(string customerId, string mandateId, bool testmode = false);
         Task<ListResponse<MandateResponse>> GetMandateListAsync(string customerId, string from = null, int? limit = null, bool testmode = false);
         Task<MandateResponse> CreateMandateAsync(string customerId, MandateRequest request);
diff --git a/src/Mollie.Api/Client/Abstract/IOnboardingClient.cs b/src/Mollie.Api/Client/Abstract/IOnboardingClient.cs
index 8ded51f4..3d626e66 100644
--- a/src/Mollie.Api/Client/Abstract/IOnboardingClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IOnboardingClient.cs
@@ -1,10 +1,9 @@
-using System;
-using Mollie.Api.Models.Onboarding.Request;
+using Mollie.Api.Models.Onboarding.Request;
 using Mollie.Api.Models.Onboarding.Response;
 using System.Threading.Tasks;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IOnboardingClient : IDisposable {
+    public interface IOnboardingClient : IBaseMollieClient {
         /// <summary>
         /// Get the status of onboarding of the authenticated organization.
         /// </summary>
diff --git a/src/Mollie.Api/Client/Abstract/IOrderClient.cs b/src/Mollie.Api/Client/Abstract/IOrderClient.cs
index 87a713e5..c411fb2c 100644
--- a/src/Mollie.Api/Client/Abstract/IOrderClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IOrderClient.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Order;
@@ -9,7 +8,7 @@
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IOrderClient : IDisposable {
+    public interface IOrderClient : IBaseMollieClient {
         Task<OrderResponse> CreateOrderAsync(OrderRequest orderRequest);
         Task<OrderResponse> GetOrderAsync(
             string orderId, bool embedPayments = false, bool embedRefunds = false, bool embedShipments = false, bool testmode = false);
diff --git a/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs b/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs
index feaefe41..18e9ab9a 100644
--- a/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Organization;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IOrganizationsClient : IDisposable {
+    public interface IOrganizationsClient : IBaseMollieClient {
         Task<OrganizationResponse> GetCurrentOrganizationAsync();
         Task<OrganizationResponse> GetOrganizationAsync(string organizationId);
         Task<ListResponse<OrganizationResponse>> GetOrganizationsListAsync(string from = null, int? limit = null);
diff --git a/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs
index a30cf887..c6359c22 100644
--- a/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.PaymentLink.Request;
 using Mollie.Api.Models.PaymentLink.Response;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IPaymentLinkClient : IDisposable {
+    public interface IPaymentLinkClient : IBaseMollieClient {
         Task<PaymentLinkResponse> CreatePaymentLinkAsync(PaymentLinkRequest paymentLinkRequest);
 
         /// <summary>
diff --git a/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs
index fe2dbfc7..79f7e4a0 100644
--- a/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Payment;
@@ -7,7 +6,7 @@
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IPaymentMethodClient : IDisposable {
+    public interface IPaymentMethodClient : IBaseMollieClient {
 		Task<PaymentMethodResponse> GetPaymentMethodAsync(
             string paymentMethod, 
             bool includeIssuers = false, 
diff --git a/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs b/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs
index 9e1f3e05..8d4f9fb9 100644
--- a/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Permission;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IPermissionsClient : IDisposable {
+    public interface IPermissionsClient : IBaseMollieClient {
         Task<PermissionResponse> GetPermissionAsync(string permissionId);
         Task<PermissionResponse> GetPermissionAsync(UrlObjectLink<PermissionResponse> url);
         Task<ListResponse<PermissionResponse>> GetPermissionListAsync();
diff --git a/src/Mollie.Api/Client/Abstract/IProfileClient.cs b/src/Mollie.Api/Client/Abstract/IProfileClient.cs
index 0f2d5bfe..e083eacc 100644
--- a/src/Mollie.Api/Client/Abstract/IProfileClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IProfileClient.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.Profile.Request;
@@ -7,7 +6,7 @@
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IProfileClient : IDisposable {
+    public interface IProfileClient : IBaseMollieClient {
         Task<ProfileResponse> CreateProfileAsync(ProfileRequest request);
         Task<ProfileResponse> GetProfileAsync(string profileId);
         Task<ProfileResponse> GetProfileAsync(UrlObjectLink<ProfileResponse> url);
diff --git a/src/Mollie.Api/Client/Abstract/IRefundClient.cs b/src/Mollie.Api/Client/Abstract/IRefundClient.cs
index b47fb415..3223da69 100644
--- a/src/Mollie.Api/Client/Abstract/IRefundClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IRefundClient.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IRefundClient : IDisposable {
+    public interface IRefundClient : IBaseMollieClient {
         Task CancelRefundAsync(string paymentId, string refundId, bool testmode = false);
         Task<RefundResponse> CreateRefundAsync(string paymentId, RefundRequest refundRequest);
         Task<RefundResponse> GetRefundAsync(string paymentId, string refundId, bool testmode = false);
diff --git a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs b/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs
index dec04c2c..e272fbb3 100644
--- a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs
@@ -9,7 +9,7 @@
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface ISettlementsClient : IDisposable {
+    public interface ISettlementsClient : IBaseMollieClient {
         Task<SettlementResponse> GetSettlementAsync(string settlementId);
         Task<SettlementResponse> GetNextSettlement();
         Task<SettlementResponse> GetOpenSettlement();
diff --git a/src/Mollie.Api/Client/Abstract/IShipmentClient.cs b/src/Mollie.Api/Client/Abstract/IShipmentClient.cs
index 5c22ecef..36acccac 100644
--- a/src/Mollie.Api/Client/Abstract/IShipmentClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IShipmentClient.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Shipment;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IShipmentClient : IDisposable {
+    public interface IShipmentClient : IBaseMollieClient {
         Task<ShipmentResponse> CreateShipmentAsync(string orderId, ShipmentRequest shipmentRequest);
         Task<ShipmentResponse> GetShipmentAsync(string orderId, string shipmentId, bool testmode = false);
         Task<ShipmentResponse> GetShipmentAsync(UrlObjectLink<ShipmentResponse> url);
diff --git a/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs b/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs
index 95945d45..6b37f40a 100644
--- a/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Payment.Response;
 using Mollie.Api.Models.Subscription;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface ISubscriptionClient : IDisposable {
+    public interface ISubscriptionClient : IBaseMollieClient {
         Task CancelSubscriptionAsync(string customerId, string subscriptionId, bool testmode = false);
         Task<SubscriptionResponse> CreateSubscriptionAsync(string customerId, SubscriptionRequest request);
         Task<SubscriptionResponse> GetSubscriptionAsync(string customerId, string subscriptionId, bool testmode = false);
diff --git a/src/Mollie.Api/Client/Abstract/ITerminalClient.cs b/src/Mollie.Api/Client/Abstract/ITerminalClient.cs
index 625979f7..21548137 100644
--- a/src/Mollie.Api/Client/Abstract/ITerminalClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ITerminalClient.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Mollie.Api.Models.List;
 using Mollie.Api.Models.Terminal;
 using Mollie.Api.Models.Url;
@@ -8,7 +7,7 @@ namespace Mollie.Api.Client.Abstract
 {    /// <summary>
      /// Calls in this class are documented in https://docs.mollie.com/reference/v2/terminals-api/overview
      /// </summary>
-    public interface ITerminalClient : IDisposable {
+    public interface ITerminalClient : IBaseMollieClient {
         Task<TerminalResponse> GetTerminalAsync(string terminalId);
         Task<TerminalResponse> GetTerminalAsync(UrlObjectLink<TerminalResponse> url);
         Task<ListResponse<TerminalResponse>> GetTerminalListAsync(string from = null, int? limit = null, string profileId = null, bool testmode = false);
diff --git a/src/Mollie.Api/Client/Abstract/IWalletClient.cs b/src/Mollie.Api/Client/Abstract/IWalletClient.cs
index 27d31216..313f4310 100644
--- a/src/Mollie.Api/Client/Abstract/IWalletClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IWalletClient.cs
@@ -3,7 +3,7 @@
 using Mollie.Api.Models.Wallet.Response;
 
 namespace Mollie.Api.Client.Abstract {
-    public interface IWalletClient {
+    public interface IWalletClient : IBaseMollieClient {
         Task<ApplePayPaymentSessionResponse> RequestApplePayPaymentSessionAsync(ApplePayPaymentSessionRequest request);
     }
 }
\ No newline at end of file
diff --git a/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs b/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs
index ba4f0ddb..c3fc399e 100644
--- a/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs
@@ -30,17 +30,20 @@ public async Task CreatePaymentAsync_WithCustomIdempotencyKey_CustomIdemPotencyK
         const string customIdempotencyKey = "my-idempotency-key";
         const string jsonToReturnInMockResponse = defaultPaymentJsonResponse;
         var mockHttp = new MockHttpMessageHandler();
-        mockHttp.When($"{BaseMollieClient.ApiEndPoint}*")
-            .With(request => request.Headers.Contains("Idempotency-Key") && request.Headers.GetValues("Idempotency-Key").Single() == customIdempotencyKey)
+        mockHttp.Expect(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}*")
+            .WithHeaders("Idempotency-Key", customIdempotencyKey)
             .Respond("application/json", jsonToReturnInMockResponse);
         HttpClient httpClient = mockHttp.ToHttpClient();
         PaymentClient paymentClient = new PaymentClient("abcde", httpClient);
 
-        // Arrange & Act
+        // Act
         using (paymentClient.WithIdempotencyKey(customIdempotencyKey))
         {
             await paymentClient.CreatePaymentAsync(paymentRequest);
         }
+
+        // Assert
+        mockHttp.VerifyNoOutstandingExpectation();
     }
     
     [Fact]