diff --git a/nvim-core/src/lib.rs b/nvim-core/src/lib.rs
index dd2f412..d1d0054 100644
--- a/nvim-core/src/lib.rs
+++ b/nvim-core/src/lib.rs
@@ -836,7 +836,8 @@ mod tests {
     async fn test_read_message_jsonl() {
         let input = "{\"jsonrpc\": \"2.0\", \"id\": 1, \"method\": \"test\"}\n";
         let mut reader = BufReader::new(input.as_bytes());
-        let req = read_message(&mut reader).await.unwrap();
+        let raw = mcp_stdio::read_mcp_message(&mut reader).await.unwrap();
+        let req: JsonRpcRequest = serde_json::from_str(&raw).unwrap();
         assert_eq!(req.method, "test");
     }
 
@@ -845,7 +846,8 @@ mod tests {
         let payload = "{\"jsonrpc\": \"2.0\", \"id\": 2, \"method\": \"test2\"}";
         let input = format!("Content-Length: {}\r\n\r\n{}", payload.len(), payload);
         let mut reader = BufReader::new(input.as_bytes());
-        let req = read_message(&mut reader).await.unwrap();
+        let raw = mcp_stdio::read_mcp_message(&mut reader).await.unwrap();
+        let req: JsonRpcRequest = serde_json::from_str(&raw).unwrap();
         assert_eq!(req.method, "test2");
     }
 
@@ -853,7 +855,7 @@ mod tests {
     async fn test_read_message_malformed() {
         let input = "Content-Length: abc\r\n\r\n{}";
         let mut reader = BufReader::new(input.as_bytes());
-        let req = read_message(&mut reader).await;
+        let req = mcp_stdio::read_mcp_message(&mut reader).await;
         assert!(req.is_none());
     }
 }
diff --git a/patch_tests.py b/patch_tests.py
new file mode 100644
index 0000000..72f921f
--- /dev/null
+++ b/patch_tests.py
@@ -0,0 +1,12 @@
+import re
+
+with open('C:\\Users\\reazul.ashraf\\workspace\\rust\\mcp-memory\\nvim-core\\src\\lib.rs', 'r', encoding='utf-8') as f:
+    content = f.read()
+
+content = content.replace('read_message(&mut reader)', 'mcp_stdio::read_mcp_message(&mut reader)')
+content = content.replace('let req = mcp_stdio::read_mcp_message(&mut reader).await.unwrap();', 'let raw = mcp_stdio::read_mcp_message(&mut reader).await.unwrap();\n        let req: JsonRpcRequest = serde_json::from_str(&raw).unwrap();')
+content = content.replace('let req = mcp_stdio::read_mcp_message(&mut reader).await;', 'let req = mcp_stdio::read_mcp_message(&mut reader).await;')
+
+with open('C:\\Users\\reazul.ashraf\\workspace\\rust\\mcp-memory\\nvim-core\\src\\lib.rs', 'w', encoding='utf-8') as f:
+    f.write(content)
+print("Patched tests")