diff --git a/StabilityMatrix.Tests/Core/AsyncStreamReaderTests.cs b/StabilityMatrix.Tests/Core/AsyncStreamReaderTests.cs
index 2aa54eee..a04b58e3 100644
--- a/StabilityMatrix.Tests/Core/AsyncStreamReaderTests.cs
+++ b/StabilityMatrix.Tests/Core/AsyncStreamReaderTests.cs
@@ -1,4 +1,5 @@
 using System.Text;
+using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Processes;
 
 namespace StabilityMatrix.Tests.Core;
@@ -14,8 +15,12 @@ public class AsyncStreamReaderTests
     // Test newlines handling for \r\n, \n
     [DataRow("a\r\nb\nc", "a\r\n", "b\n", "c")]
     // Carriage returns \r should be sent as is
-    [DataRow("a\rb\rc", "a\rb\rc")]
-    [DataRow("a1\ra2\nb1\rb2", "a1\ra2\n", "b1\rb2")]
+    [DataRow("a\rb\rc", "a", "\rb", "\rc")]
+    [DataRow("a1\ra2\nb1\rb2", "a1", "\ra2\n", "b1", "\rb2")]
+    // Ansi escapes should be seperated
+    [DataRow("\x1b[A\x1b[A", "\x1b[A", "\x1b[A")]
+    // Mixed Ansi and newlines
+    [DataRow("a \x1b[A\r\n\r xyz", "a ", "\x1b[A", "\r\n", "\r xyz")]
     public async Task TestRead(string source, params string[] expected)
     {
         var queue = new Queue<string?>(expected);
@@ -36,6 +41,34 @@ public class AsyncStreamReaderTests
         await reader.EOF;
         
         // Check if all expected strings were read
-        Assert.AreEqual(0, queue.Count);
+        Assert.AreEqual(0, queue.Count, "Remaining: " + string.Join(", ", queue.ToArray()
+            .Select(s => (s ?? "<null>").ToRepr())));
+    }
+    
+    [TestMethod]
+    public async Task TestCarriageReturnHandling()
+    {
+        // The previous buffer should be sent when \r is encountered
+        const string source = "dog\r\ncat\r123\r456";
+        var stream = new MemoryStream(Encoding.UTF8.GetBytes(source));
+        
+        var queue = new Queue<string?>(new[] {"dog\r\n", "cat", "\r123", "\r456"});
+        
+        var callback = new Action<string?>(s =>
+        {
+            Assert.IsTrue(queue.Count > 0);
+            Assert.AreEqual(queue.Dequeue(), s);
+        });
+        
+        // Make the reader
+        using var reader = new AsyncStreamReader(stream, callback, Encoding.UTF8);
+        
+        // Begin read line and wait until finish
+        reader.BeginReadLine();
+        await reader.EOF;
+        
+        // Check if all expected strings were read
+        Assert.AreEqual(0, queue.Count, "Remaining: " + string.Join(", ", queue.ToArray()
+            .Select(s => (s ?? "<null>").ToRepr())));
     }
 }