diff --git a/source/Halibut.Tests/Halibut.Tests.csproj b/source/Halibut.Tests/Halibut.Tests.csproj
index ffc36306b..58133f89e 100644
--- a/source/Halibut.Tests/Halibut.Tests.csproj
+++ b/source/Halibut.Tests/Halibut.Tests.csproj
@@ -10,7 +10,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup Condition="!$([MSBuild]::IsOSUnixLike())">
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+	  <TargetFrameworks>net48;net6.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOSUnixLike())">
     <TargetFramework>net6.0</TargetFramework>
diff --git a/source/Halibut.Tests/UsageFixture.cs b/source/Halibut.Tests/UsageFixture.cs
index 8a2417d74..384000636 100644
--- a/source/Halibut.Tests/UsageFixture.cs
+++ b/source/Halibut.Tests/UsageFixture.cs
@@ -81,7 +81,8 @@ public async Task OctopusCanSendMessagesToTentacle_WithSupportedServices(ClientA
         }
 
         [Test]
-        [LatestAndPreviousClientAndServiceVersionsTestCases]
+        //[LatestAndPreviousClientAndServiceVersionsTestCases()]
+        [LatestClientAndLatestServiceTestCases()]
         [FailedWebSocketTestsBecomeInconclusive]
         public async Task StreamsCanBeSent(ClientAndServiceTestCase clientAndServiceTestCase)
         {
diff --git a/source/Halibut/Transport/Protocol/MessageExchangeStream.cs b/source/Halibut/Transport/Protocol/MessageExchangeStream.cs
index 6adeed809..03156d8a2 100644
--- a/source/Halibut/Transport/Protocol/MessageExchangeStream.cs
+++ b/source/Halibut/Transport/Protocol/MessageExchangeStream.cs
@@ -182,10 +182,13 @@ public RemoteIdentity ReadRemoteIdentity()
 
         public void Send<T>(T message)
         {
+            Stream stream = this.stream;
+            stream = new BufferedStream(stream, 10000000);
             using (var capture = StreamCapture.New())
             {
                 serializer.WriteMessage(stream, message);
-                WriteEachStream(capture.SerializedStreams);
+                WriteEachStream(capture.SerializedStreams, stream);
+                stream.Flush();
             }
 
             log.Write(EventType.Diagnostic, "Sent: {0}", message);
@@ -275,7 +278,7 @@ static DataStream FindStreamById(StreamCapture capture, Guid id)
             return dataStream;
         }
 
-        void WriteEachStream(IEnumerable<DataStream> streams)
+        void WriteEachStream(IEnumerable<DataStream> streams, Stream stream)
         {
             foreach (var dataStream in streams)
             {