diff --git a/Tests/AWSLambdaRuntimeTests/NewLambda+CodableTests.swift b/Tests/AWSLambdaRuntimeTests/Lambda+CodableTests.swift
similarity index 82%
rename from Tests/AWSLambdaRuntimeTests/NewLambda+CodableTests.swift
rename to Tests/AWSLambdaRuntimeTests/Lambda+CodableTests.swift
index 35d56225..9d1cec21 100644
--- a/Tests/AWSLambdaRuntimeTests/NewLambda+CodableTests.swift
+++ b/Tests/AWSLambdaRuntimeTests/Lambda+CodableTests.swift
@@ -77,24 +77,24 @@ struct JSONTests {
         let result = await writer.output
         #expect(result == ByteBuffer(string: #"{"bar":"baz"}"#))
     }
-}
 
-final actor MockLambdaWriter: LambdaResponseStreamWriter {
-    private var _buffer: ByteBuffer?
+    final actor MockLambdaWriter: LambdaResponseStreamWriter {
+        private var _buffer: ByteBuffer?
 
-    var output: ByteBuffer? {
-        self._buffer
-    }
+        var output: ByteBuffer? {
+            self._buffer
+        }
 
-    func writeAndFinish(_ buffer: ByteBuffer) async throws {
-        self._buffer = buffer
-    }
+        func writeAndFinish(_ buffer: ByteBuffer) async throws {
+            self._buffer = buffer
+        }
 
-    func write(_ buffer: ByteBuffer) async throws {
-        fatalError("Unexpected call")
-    }
+        func write(_ buffer: ByteBuffer) async throws {
+            fatalError("Unexpected call")
+        }
 
-    func finish() async throws {
-        fatalError("Unexpected call")
+        func finish() async throws {
+            fatalError("Unexpected call")
+        }
     }
 }
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift
index 3253238e..ec1c9265 100644
--- a/Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift
+++ b/Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift
@@ -48,7 +48,7 @@ struct LambdaRunLoopTests {
         }
     }
 
-    let mockClient = LambdaMockClient()
+    let mockClient = MockLambdaClient()
     let mockEchoHandler = MockEchoHandler()
     let failingHandler = FailingHandler()
 
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaRuntimeTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRuntimeTests.swift
index cd519d76..76057ddf 100644
--- a/Tests/AWSLambdaRuntimeTests/LambdaRuntimeTests.swift
+++ b/Tests/AWSLambdaRuntimeTests/LambdaRuntimeTests.swift
@@ -50,7 +50,7 @@ struct LambdaRuntimeTests {
             }
 
             // wait a small amount to ensure runtime1 task is started
-            try await Task.sleep(for: .seconds(1))
+            try await Task.sleep(for: .seconds(0.5))
 
             // Running the second runtime should trigger LambdaRuntimeError
             await #expect(throws: LambdaRuntimeError.self) {
@@ -71,7 +71,7 @@ struct LambdaRuntimeTests {
             }
 
             // Set timeout and cancel the runtime 2
-            try await Task.sleep(for: .seconds(2))
+            try await Task.sleep(for: .seconds(1))
             taskGroup.cancelAll()
         }
     }
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaMockClient.swift b/Tests/AWSLambdaRuntimeTests/MockLambdaClient.swift
similarity index 97%
rename from Tests/AWSLambdaRuntimeTests/LambdaMockClient.swift
rename to Tests/AWSLambdaRuntimeTests/MockLambdaClient.swift
index 7714c84a..b9a97933 100644
--- a/Tests/AWSLambdaRuntimeTests/LambdaMockClient.swift
+++ b/Tests/AWSLambdaRuntimeTests/MockLambdaClient.swift
@@ -22,10 +22,10 @@ import FoundationEssentials
 import Foundation
 #endif
 
-struct LambdaMockWriter: LambdaRuntimeClientResponseStreamWriter {
-    var underlying: LambdaMockClient
+struct MockLambdaWriter: LambdaRuntimeClientResponseStreamWriter {
+    var underlying: MockLambdaClient
 
-    init(underlying: LambdaMockClient) {
+    init(underlying: MockLambdaClient) {
         self.underlying = underlying
     }
 
@@ -55,8 +55,8 @@ enum LambdaError: Error, Equatable {
     case handlerError
 }
 
-final actor LambdaMockClient: LambdaRuntimeClientProtocol {
-    typealias Writer = LambdaMockWriter
+final actor MockLambdaClient: LambdaRuntimeClientProtocol {
+    typealias Writer = MockLambdaWriter
 
     private struct StateMachine {
         private enum State {