diff --git a/build.ps1 b/build.ps1
index 1043c5156..1d122be8f 100755
--- a/build.ps1
+++ b/build.ps1
@@ -123,8 +123,8 @@ ForEach ($libraryProject in $libraryProjects) {
 }
 
 if (($null -ne $env:CI) -And ($EnableIntegrationTests -eq $true)) {
-    & docker pull --quiet localstack/localstack:2.2.0
-    & docker run -d --name localstack -p 4566:4566 localstack/localstack:2.2.0
+    & docker pull --quiet localstack/localstack:3.0.0
+    & docker run -d --name localstack -p 4566:4566 localstack/localstack:3.0.0
     $env:AWS_SERVICE_URL = "http://localhost:4566"
 }
 
diff --git a/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj b/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj
index 06b721f60..fb965627b 100644
--- a/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj
+++ b/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj
@@ -12,8 +12,8 @@
     <ProjectReference Include="..\JustSaying.TestingFramework\JustSaying.TestingFramework.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SimpleNotificationService" />
-    <PackageReference Include="AWSSDK.SQS" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" VersionOverride="3.7.300.5" />
+    <PackageReference Include="AWSSDK.SQS" VersionOverride="3.7.300.5" />
     <PackageReference Include="GitHubActionsTestLogger" />
     <PackageReference Include="MartinCostello.Logging.XUnit" />
     <PackageReference Include="MELT.Xunit" />
diff --git a/tests/JustSaying.IntegrationTests/docker-compose.yml b/tests/JustSaying.IntegrationTests/docker-compose.yml
index 6953cc718..cc19cb0b5 100644
--- a/tests/JustSaying.IntegrationTests/docker-compose.yml
+++ b/tests/JustSaying.IntegrationTests/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   localstack:
     container_name: localstack
     restart: unless-stopped
-    image: localstack/localstack:2.2.0
+    image: localstack/localstack:3.0.0
     ports:
       - 4566:4566
     environment:
diff --git a/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj b/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj
index 2f397a91d..d79b10b5d 100644
--- a/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj
+++ b/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj
@@ -11,8 +11,8 @@
     <ProjectReference Include="..\JustSaying.TestingFramework\JustSaying.TestingFramework.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SimpleNotificationService" />
-    <PackageReference Include="AWSSDK.SQS" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" VersionOverride="3.7.300.5" />
+    <PackageReference Include="AWSSDK.SQS" VersionOverride="3.7.300.5" />
     <PackageReference Include="GitHubActionsTestLogger" />
     <PackageReference Include="MELT" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
diff --git a/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs b/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs
index 5bfeacfc3..76b278f10 100644
--- a/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs
+++ b/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs
@@ -1,4 +1,5 @@
 using Amazon.Runtime;
+using Amazon.Runtime.Endpoints;
 using Amazon.SQS;
 using Amazon.SQS.Model;
 
@@ -36,30 +37,35 @@ public Task<AddPermissionResponse> AddPermissionAsync(
         string label,
         List<string> awsAccountIds,
         List<string> actions,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new AddPermissionResponse());
     }
 
     public Task<AddPermissionResponse> AddPermissionAsync(
         AddPermissionRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new AddPermissionResponse());
     }
 
+    public Task<CancelMessageMoveTaskResponse> CancelMessageMoveTaskAsync(CancelMessageMoveTaskRequest request, CancellationToken cancellationToken = default)
+    {
+        return Task.FromResult(new CancelMessageMoveTaskResponse());
+    }
+
     public Task<ChangeMessageVisibilityResponse> ChangeMessageVisibilityAsync(
         string queueUrl,
         string receiptHandle,
         int visibilityTimeout,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ChangeMessageVisibilityResponse());
     }
 
     public Task<ChangeMessageVisibilityResponse> ChangeMessageVisibilityAsync(
         ChangeMessageVisibilityRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ChangeMessageVisibilityResponse());
     }
@@ -67,28 +73,28 @@ public Task<ChangeMessageVisibilityResponse> ChangeMessageVisibilityAsync(
     public Task<ChangeMessageVisibilityBatchResponse> ChangeMessageVisibilityBatchAsync(
         string queueUrl,
         List<ChangeMessageVisibilityBatchRequestEntry> entries,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ChangeMessageVisibilityBatchResponse());
     }
 
     public Task<ChangeMessageVisibilityBatchResponse> ChangeMessageVisibilityBatchAsync(
         ChangeMessageVisibilityBatchRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ChangeMessageVisibilityBatchResponse());
     }
 
     public Task<CreateQueueResponse> CreateQueueAsync(
         string queueName,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new CreateQueueResponse());
     }
 
     public Task<CreateQueueResponse> CreateQueueAsync(
         CreateQueueRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new CreateQueueResponse());
     }
@@ -96,14 +102,14 @@ public Task<CreateQueueResponse> CreateQueueAsync(
     public Task<DeleteMessageResponse> DeleteMessageAsync(
         string queueUrl,
         string receiptHandle,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return DeleteMessageAsync(new DeleteMessageRequest(queueUrl, receiptHandle), cancellationToken);
     }
 
     public Task<DeleteMessageResponse> DeleteMessageAsync(
         DeleteMessageRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         DeleteMessageRequests.Add(request);
         return Task.FromResult(new DeleteMessageResponse());
@@ -113,28 +119,28 @@ public Task<DeleteMessageResponse> DeleteMessageAsync(
     public Task<DeleteMessageBatchResponse> DeleteMessageBatchAsync(
         string queueUrl,
         List<DeleteMessageBatchRequestEntry> entries,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new DeleteMessageBatchResponse());
     }
 
     public Task<DeleteMessageBatchResponse> DeleteMessageBatchAsync(
         DeleteMessageBatchRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new DeleteMessageBatchResponse());
     }
 
     public Task<DeleteQueueResponse> DeleteQueueAsync(
         string queueUrl,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new DeleteQueueResponse());
     }
 
     public Task<DeleteQueueResponse> DeleteQueueAsync(
         DeleteQueueRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new DeleteQueueResponse());
     }
@@ -142,28 +148,28 @@ public Task<DeleteQueueResponse> DeleteQueueAsync(
     public Task<GetQueueAttributesResponse> GetQueueAttributesAsync(
         string queueUrl,
         List<string> attributeNames,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new GetQueueAttributesResponse());
     }
 
     public Task<GetQueueAttributesResponse> GetQueueAttributesAsync(
         GetQueueAttributesRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new GetQueueAttributesResponse());
     }
 
     public Task<GetQueueUrlResponse> GetQueueUrlAsync(
         string queueName,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return GetQueueUrlAsync(new GetQueueUrlRequest(queueName), cancellationToken);
     }
 
     public Task<GetQueueUrlResponse> GetQueueUrlAsync(
         GetQueueUrlRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new GetQueueUrlResponse
         {
@@ -173,49 +179,54 @@ public Task<GetQueueUrlResponse> GetQueueUrlAsync(
 
     public Task<ListDeadLetterSourceQueuesResponse> ListDeadLetterSourceQueuesAsync(
         ListDeadLetterSourceQueuesRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ListDeadLetterSourceQueuesResponse());
     }
 
+    public Task<ListMessageMoveTasksResponse> ListMessageMoveTasksAsync(ListMessageMoveTasksRequest request, CancellationToken cancellationToken = default)
+    {
+        return Task.FromResult(new ListMessageMoveTasksResponse());
+    }
+
     public Task<ListQueuesResponse> ListQueuesAsync(
         string queueNamePrefix,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ListQueuesResponse());
     }
 
     public Task<ListQueuesResponse> ListQueuesAsync(
         ListQueuesRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ListQueuesResponse());
     }
 
     public Task<ListQueueTagsResponse> ListQueueTagsAsync(
         ListQueueTagsRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new ListQueueTagsResponse());
     }
 
     public Task<PurgeQueueResponse> PurgeQueueAsync(
         string queueUrl,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new PurgeQueueResponse());
     }
 
     public Task<PurgeQueueResponse> PurgeQueueAsync(
         PurgeQueueRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new PurgeQueueResponse());
     }
 
     public Task<ReceiveMessageResponse> ReceiveMessageAsync(
         string queueUrl,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return ReceiveMessageAsync(new ReceiveMessageRequest(queueUrl), cancellationToken);
     }
@@ -224,7 +235,7 @@ public Task<ReceiveMessageResponse> ReceiveMessageAsync(
     private IEnumerator<ReceiveMessageResponse> _getMessagesEnumerator;
     public async Task<ReceiveMessageResponse> ReceiveMessageAsync(
         ReceiveMessageRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         await Task.Delay(50, cancellationToken);
 
@@ -242,14 +253,14 @@ public async Task<ReceiveMessageResponse> ReceiveMessageAsync(
     public Task<RemovePermissionResponse> RemovePermissionAsync(
         string queueUrl,
         string label,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new RemovePermissionResponse());
     }
 
     public Task<RemovePermissionResponse> RemovePermissionAsync(
         RemovePermissionRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new RemovePermissionResponse());
     }
@@ -257,14 +268,14 @@ public Task<RemovePermissionResponse> RemovePermissionAsync(
     public Task<SendMessageResponse> SendMessageAsync(
         string queueUrl,
         string messageBody,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new SendMessageResponse());
     }
 
     public Task<SendMessageResponse> SendMessageAsync(
         SendMessageRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new SendMessageResponse());
     }
@@ -272,14 +283,14 @@ public Task<SendMessageResponse> SendMessageAsync(
     public Task<SendMessageBatchResponse> SendMessageBatchAsync(
         string queueUrl,
         List<SendMessageBatchRequestEntry> entries,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new SendMessageBatchResponse());
     }
 
     public Task<SendMessageBatchResponse> SendMessageBatchAsync(
         SendMessageBatchRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new SendMessageBatchResponse());
     }
@@ -287,31 +298,41 @@ public Task<SendMessageBatchResponse> SendMessageBatchAsync(
     public Task<SetQueueAttributesResponse> SetQueueAttributesAsync(
         string queueUrl,
         Dictionary<string, string> attributes,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new SetQueueAttributesResponse());
     }
 
     public Task<SetQueueAttributesResponse> SetQueueAttributesAsync(
         SetQueueAttributesRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new SetQueueAttributesResponse());
     }
 
+    public Task<StartMessageMoveTaskResponse> StartMessageMoveTaskAsync(StartMessageMoveTaskRequest request, CancellationToken cancellationToken = default)
+    {
+        return Task.FromResult(new StartMessageMoveTaskResponse());
+    }
+
     public Task<TagQueueResponse> TagQueueAsync(
         TagQueueRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new TagQueueResponse());
     }
 
     public Task<UntagQueueResponse> UntagQueueAsync(
         UntagQueueRequest request,
-        CancellationToken cancellationToken = new CancellationToken())
+        CancellationToken cancellationToken = default)
     {
         return Task.FromResult(new UntagQueueResponse());
     }
 
+    public Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request)
+    {
+        return new Endpoint("https://testqueues.com");
+    }
+
     public ISQSPaginatorFactory Paginators { get; set; }
-}
\ No newline at end of file
+}