diff --git a/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift b/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift
index 2c48faa9..d02c3f3b 100644
--- a/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift
+++ b/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift
@@ -312,7 +312,6 @@ class Mqtt5ClientTests: XCBaseTestCase {
         XCTAssertNotNil(clientOptions)
         let mqtt5client = try Mqtt5Client(clientOptions: clientOptions);
         XCTAssertNotNil(mqtt5client)
-        mqtt5client.close()
     }
 
     /*
@@ -371,7 +370,6 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let context = MqttTestContext()
         let mqtt5client = try createClient(clientOptions: clientOptions, testContext: context)
         XCTAssertNotNil(mqtt5client)
-        mqtt5client.close()
     }
 
     /*===============================================================
@@ -390,7 +388,6 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -418,7 +415,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -442,7 +439,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -469,7 +466,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -501,7 +498,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -559,7 +556,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -582,7 +579,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
         testContext.withWebsocketTransform(isSuccess: true)
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -612,7 +609,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
         testContext.withWebsocketTransform(isSuccess: true)
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -640,7 +637,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         testContext.withWebsocketTransform(isSuccess: true)
 
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -681,7 +678,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         testContext.withIoTSigv4WebsocketTransform(region: region, provider: provider)
 
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         testContext.onWebSocketHandshake = nil
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
@@ -725,7 +722,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
 
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         testContext.onWebSocketHandshake = nil
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
@@ -785,7 +782,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
         testContext.withWebsocketTransform(isSuccess: true)
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
         try disconnectClientCleanup(client:client, testContext: testContext)
     }
@@ -807,7 +804,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
 
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try client.start()
 
         if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
@@ -839,7 +836,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
 
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try client.start()
 
         if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
@@ -875,7 +872,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
         testContext.withWebsocketTransform(isSuccess: true)
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
 
         try client.start()
 
@@ -910,7 +907,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
 
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try client.start()
 
         if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
@@ -943,7 +940,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
 
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try client.start()
 
         if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
@@ -977,7 +974,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
         let testContext = MqttTestContext()
         testContext.withWebsocketTransform(isSuccess: false)
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try client.start()
 
         if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
@@ -1028,7 +1025,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext(contextName: "client1")
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         // Create a second client with the same client id
@@ -1076,7 +1073,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               connectOptions: connectOptions)
 
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative keepAliveInterval didn't throw an error.")
             return
         }
@@ -1090,7 +1087,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               connectOptions: connectOptions)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative sessionExpiryInterval didn't throw an error.")
             return
         } catch {
@@ -1103,7 +1100,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               connectOptions: connectOptions)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative willDelayInterval didn't throw an error.")
             return
         } catch {
@@ -1115,7 +1112,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               minReconnectDelay: -1)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative minReconnectDelay didn't throw an error.")
             return
         } catch {
@@ -1127,7 +1124,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               maxReconnectDelay: -1)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative maxReconnectDelay didn't throw an error.")
             return
         } catch {
@@ -1139,7 +1136,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               minConnectedTimeToResetReconnectDelay: -1)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative minConnectedTimeToResetReconnectDelay didn't throw an error.")
             return
         } catch {
@@ -1151,7 +1148,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               pingTimeout: -1)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative pingTimeout didn't throw an error.")
             return
         } catch {
@@ -1163,7 +1160,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               connackTimeout: -1)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative connackTimeout didn't throw an error.")
             return
         } catch {
@@ -1175,7 +1172,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
                                               port: UInt32(8883),
                                               ackTimeout: -1)
             let client = try Mqtt5Client(clientOptions: clientOptions)
-            defer { client.close() }
+
             XCTFail("Negative ackTimeout didn't throw an error.")
             return
         } catch {
@@ -1205,7 +1202,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         let disconnectPacket = DisconnectPacket(sessionExpiryInterval: -1)
@@ -1240,7 +1237,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         let publishPacket = PublishPacket(qos: .atMostOnce,
@@ -1281,7 +1278,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         if let negotiatedSettings = testContext.negotiatedSettings {
@@ -1317,7 +1314,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         if let negotiatedSettings = testContext.negotiatedSettings {
@@ -1367,7 +1364,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         if let negotiatedSettings = testContext.negotiatedSettings {
@@ -1408,7 +1405,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
             let testContext = MqttTestContext()
             let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-            defer { client.close() }
+
             try connectClient(client: client, testContext: testContext)
 
             let topic = "test/MQTT5_Binding_Swift_" + UUID().uuidString
@@ -1533,7 +1530,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         let topic = "test/MQTT5_Binding_Swift_" + UUID().uuidString
@@ -1581,7 +1578,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
             let testContext = MqttTestContext()
             let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-            defer { client.close() }
+
             try connectClient(client: client, testContext: testContext)
 
             let topic1 = "test/MQTT5_Binding_Swift_" + UUID().uuidString
@@ -1645,7 +1642,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         let publishPacket = PublishPacket(qos: .atLeastOnce, topic: "")
@@ -1677,7 +1674,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         let subscribePacket = SubscribePacket(topicFilter: "", qos: .atLeastOnce)
@@ -1709,7 +1706,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
+
         try connectClient(client: client, testContext: testContext)
 
         let unsubscribePacket = UnsubscribePacket(topicFilter: "")
@@ -1931,7 +1928,6 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
-        defer { client.close() }
         try connectClient(client: client, testContext: testContext)
     }
 
@@ -1949,6 +1945,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
 
         let testContext = MqttTestContext()
         let client = try createClient(clientOptions: clientOptions, testContext: testContext)
+        // offline operation would never complete. Use close to force quit
         defer { client.close() }
         try connectClient(client: client, testContext: testContext)
         try stopClient(client: client, testContext: testContext)