diff --git a/Package.swift b/Package.swift
index 8cd7ad2c0..ea9f9f5b3 100644
--- a/Package.swift
+++ b/Package.swift
@@ -120,10 +120,6 @@ var package = Package(
                         .target(name: "TestCommon")
                     ]),
         
-//        .target(name: "AuthFoundationTestCommon",
-//                dependencies: ["AuthFoundation"],
-//                path: "Tests/AuthFoundationTestCommon"),
-
         // Abstract API Client
         .target(name: "APIClient",
                 dependencies: [
diff --git a/Sources/JWT/JSONPayload.swift b/Sources/JWT/JSONPayload.swift
deleted file mode 100644
index 078d20fcf..000000000
--- a/Sources/JWT/JSONPayload.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 2024-Present, Okta, Inc. and/or its affiliates. All rights reserved.
-// The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
-//
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and limitations under the License.
-//
-
-import Foundation
-
-//extension Dictionary<String, Any> {
-//    public static func decodeJSONObject(from decoder: Decoder) throws -> [String: any Sendable] {
-//        let container = try decoder.container(keyedBy: JSONCodingKeys.self)
-//        return try container.decode([String: Any].self)
-//    }
-//
-//    public static func encodeJSONObject(_ object: [String: any Sendable], to encoder: Encoder) throws {
-//        var container = encoder.container(keyedBy: JSONCodingKeys.self)
-//        try object
-//            .compactMap { (key: String, value: Any) in
-//                guard let key = JSONCodingKeys(stringValue: key) else { return nil }
-//                return (key, value)
-//            }
-//            .forEach { (key: JSONCodingKeys, value: Any) in
-//                if let value = value as? Bool {
-//                    try container.encode(value, forKey: key)
-//                } else if let value = value as? String {
-//                    try container.encode(value, forKey: key)
-//                } else if let value = value as? Int {
-//                    try container.encode(value, forKey: key)
-//                } else if let value = value as? Double {
-//                    try container.encode(value, forKey: key)
-//                } else if let value = value as? [String: String] {
-//                    try container.encode(value, forKey: key)
-//                }
-//            }
-//    }
-//
-//}
diff --git a/Tests/APIClientTestCommon/MockApiRequest.swift b/Tests/APIClientTestCommon/MockApiRequest.swift
index 9ef89dc01..39b44d0f4 100644
--- a/Tests/APIClientTestCommon/MockApiRequest.swift
+++ b/Tests/APIClientTestCommon/MockApiRequest.swift
@@ -17,16 +17,20 @@ import Foundation
 import FoundationNetworking
 #endif
 
-//struct MockApiRequest: APIRequest {
-//    var url: URL
-//    var cachePolicy: URLRequest.CachePolicy
-//
-//    typealias ResponseType = Token
-//
-//    init(url: URL,
-//         cachePolicy: URLRequest.CachePolicy = .reloadIgnoringLocalAndRemoteCacheData)
-//    {
-//        self.url = url
-//        self.cachePolicy = cachePolicy
-//    }
-//}
+struct SampleResponse: Decodable, Sendable {
+    let message: String
+}
+
+struct MockApiRequest<ResponseType: Decodable & Sendable>: APIRequest {
+    typealias ResponseType = ResponseType
+    
+    var url: URL
+    var cachePolicy: URLRequest.CachePolicy
+
+    init(url: URL,
+         cachePolicy: URLRequest.CachePolicy = .reloadIgnoringLocalAndRemoteCacheData)
+    {
+        self.url = url
+        self.cachePolicy = cachePolicy
+    }
+}
diff --git a/Tests/APIClientTests/APIClientTests.swift b/Tests/APIClientTests/APIClientTests.swift
index bbce8794e..deb146de2 100644
--- a/Tests/APIClientTests/APIClientTests.swift
+++ b/Tests/APIClientTests/APIClientTests.swift
@@ -29,55 +29,59 @@ struct MockApiParsingContext: APIParsingContext {
     }
 }
 
-//class APIClientTests: XCTestCase {
-//    var client: MockApiClient!
-//    let baseUrl = URL(string: "https://example.okta.com/oauth2/v1/token")!
-//    var configuration: MockAPIClientConfiguration!
-//    let urlSession = URLSessionMock()
-//    let requestId = UUID().uuidString
-//    
-//    override func setUpWithError() throws {
-//        configuration = MockAPIClientConfiguration(baseURL: baseUrl,
-//                                                   clientId: "clientid",
-//                                                   scopes: "openid")
-//        client = MockApiClient(configuration: configuration,
-//                               session: urlSession,
-//                               baseURL: baseUrl)
-//    }
-//
-//    @MainActor
-//    func testOverrideRequestResult() throws {
-//        client = MockApiClient(configuration: configuration,
-//                               session: urlSession,
-//                               baseURL: baseUrl,
-//                               shouldRetry: .doNotRetry)
-//
-//        urlSession.expect("https://example.okta.com/oauth2/v1/token",
-//                          data: try data(filename: "token",
-//                                         matching: "APIClientTestCommon"),
-//                          statusCode: 400,
-//                          contentType: "application/json",
-//                          headerFields: ["x-rate-limit-limit": "0",
-//                                         "x-rate-limit-remaining": "0",
-//                                         "x-rate-limit-reset": "1609459200",
-//                                         "Date": "Fri, 09 Sep 2022 02:22:14 GMT",
-//                                         "x-okta-request-id": requestId])
-//        
-//        let apiRequest = MockApiRequest(url: baseUrl)
-//        let context = MockApiParsingContext(result: .success)
-//
-//        let expect = expectation(description: "network request")
-//        apiRequest.send(to: client, parsing: context, completion: { result in
-//            switch result {
-//            case .success(let response):
-//                XCTAssertEqual(response.statusCode, 400)
-//            case .failure(_):
-//                XCTFail("Did not expect the request to fail")
-//            }
-//            expect.fulfill()
-//        })
-//        waitForExpectations(timeout: 9.0) { error in
-//            XCTAssertNil(error)
-//        }
-//    }
-//}
+class APIClientTests: XCTestCase {
+    var client: MockApiClient!
+    let baseUrl = URL(string: "https://example.okta.com/oauth2/v1/token")!
+    var configuration: MockAPIClientConfiguration!
+    let urlSession = URLSessionMock()
+    let requestId = UUID().uuidString
+    
+    static override func setUp() {
+        registerMock(bundles: .apiClientTestCommon)
+    }
+    
+    override func setUpWithError() throws {
+        configuration = MockAPIClientConfiguration(baseURL: baseUrl,
+                                                   clientId: "clientid",
+                                                   scopes: "openid")
+        client = MockApiClient(configuration: configuration,
+                               session: urlSession,
+                               baseURL: baseUrl)
+    }
+
+    func testOverrideRequestResult() throws {
+        client = MockApiClient(configuration: configuration,
+                               session: urlSession,
+                               baseURL: baseUrl,
+                               shouldRetry: .doNotRetry)
+
+        urlSession.expect("https://example.okta.com/oauth2/v1/token",
+                          data: data(for: """
+                              { "message": "Hello world!" }
+                              """),
+                          statusCode: 400,
+                          contentType: "application/json",
+                          headerFields: ["x-rate-limit-limit": "0",
+                                         "x-rate-limit-remaining": "0",
+                                         "x-rate-limit-reset": "1609459200",
+                                         "Date": "Fri, 09 Sep 2022 02:22:14 GMT",
+                                         "x-okta-request-id": requestId])
+        
+        let apiRequest: MockApiRequest<SampleResponse> = MockApiRequest(url: baseUrl)
+        let context = MockApiParsingContext(result: .success)
+
+        let expect = expectation(description: "network request")
+        apiRequest.send(to: client, parsing: context, completion: { result in
+            switch result {
+            case .success(let response):
+                XCTAssertEqual(response.statusCode, 400)
+            case .failure(_):
+                XCTFail("Did not expect the request to fail")
+            }
+            expect.fulfill()
+        })
+        waitForExpectations(timeout: 9.0) { error in
+            XCTAssertNil(error)
+        }
+    }
+}
diff --git a/Tests/APIClientTests/APIRetryTests.swift b/Tests/APIClientTests/APIRetryTests.swift
index 0c2d30b21..55c18ecaa 100644
--- a/Tests/APIClientTests/APIRetryTests.swift
+++ b/Tests/APIClientTests/APIRetryTests.swift
@@ -45,163 +45,151 @@ final class MockAPIClientConfiguration: APIClientConfiguration, Sendable {
     }
 }
 
-//class APIRetryTests: XCTestCase {
-//    var client: MockApiClient!
-//    let baseUrl = URL(string: "https://example.okta.com/oauth2/v1/token")!
-//    var configuration: MockAPIClientConfiguration!
-//    let urlSession = URLSessionMock()
-//    var apiRequest: MockApiRequest!
-//    let requestId = UUID().uuidString
-//    
-//    override func setUpWithError() throws {
-//        configuration = MockAPIClientConfiguration(baseURL: baseUrl,
-//                                                   clientId: "clientid",
-//                                                   scopes: "openid")
-//        client = MockApiClient(configuration: configuration,
-//                               session: urlSession,
-//                               baseURL: baseUrl)
-//        apiRequest = MockApiRequest(url: baseUrl)
-//    }
-//
-//    @MainActor
-//    func testShouldNotRetry() throws {
-//        client = MockApiClient(configuration: configuration,
-//                               session: urlSession,
-//                               baseURL: baseUrl,
-//                               shouldRetry: .doNotRetry)
-//        try performRetryRequest(count: 1)
-//        XCTAssertNil(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"])
-//    }
-//    
-//    @MainActor
-//    func testDefaultRetryCount() throws {
-//        try performRetryRequest(count: 4)
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "3")
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
-//    }
-//
-//    @MainActor
-//    func testApiRetryReturnsSuccessStatusCode() throws {
-//        try performRetryRequest(count: 1, isSuccess: true)
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "1")
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
-//    }
-//    
-//    @MainActor
-//    func testApiRetryUsingMaximumRetryAttempt() throws {
-//        try performRetryRequest(count: 3, isSuccess: true)
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "3")
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
-//    }
-//    
-//    @MainActor
-//    func testCustomRetryCount() throws {
-//        client = MockApiClient(configuration: configuration,
-//                               session: urlSession,
-//                               baseURL: baseUrl,
-//                               shouldRetry: .retry(maximumCount: 5))
-//        try performRetryRequest(count: 6)
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "5")
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
-//    }
-//    
-//    @MainActor
-//    func testRetryDelegateDoNotRetry() throws {
-//        let delegate = APIRetryDelegateRecorder()
-//        delegate.response = .doNotRetry
-//        client.delegate = delegate
-//        
-//        try performRetryRequest(count: 1, isSuccess: false)
-//        XCTAssertEqual(delegate.requests.count, 1)
-//        XCTAssertNil(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"])
-//    }
-//    
-//    @MainActor
-//    func testRetryDelegateRetry() throws {
-//        let delegate = APIRetryDelegateRecorder()
-//        delegate.response = .retry(maximumCount: 5)
-//        client.delegate = delegate
-//        
-//        try performRetryRequest(count: 5, isSuccess: true)
-//        XCTAssertEqual(delegate.requests.count, 1)
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "5")
-//        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
-//    }
-//    
-//    func testApiRateLimit() throws {
-//        let date = "Fri, 09 Sep 2022 02:22:14 GMT"
-//        let rateLimit = APIRateLimit(with: ["x-rate-limit-limit": "0",
-//                                            "x-rate-limit-remaining": "0",
-//                                            "x-rate-limit-reset": "1662690193",
-//                                            "Date": date])
-//        XCTAssertNotNil(rateLimit?.delay)
-//        XCTAssertEqual(rateLimit?.delay, 59.0)
-//    }
-//    
-//    @MainActor
-//    func testMissingResetHeader() throws {
-//        urlSession.expect("https://example.okta.com/oauth2/v1/token",
-//                          data: try data(filename: "token",
-//                                         matching: "APIClientTestCommon"),
-//                          statusCode: 429,
-//                          contentType: "application/json",
-//                          headerFields: ["x-rate-limit-limit": "0",
-//                                         "x-rate-limit-remaining": "0",
-//                                         "x-okta-request-id": requestId])
-//        
-//        let expect = expectation(description: "network request")
-//        apiRequest.send(to: client, completion: { result in
-//            guard case .failure(let error) = result else {
-//                XCTFail()
-//                return
-//            }
-//            XCTAssertEqual(error.localizedDescription, APIClientError.statusCode(429).localizedDescription)
-//            expect.fulfill()
-//        })
-//        
-//        waitForExpectations(timeout: 1.0) { error in
-//            XCTAssertNil(error)
-//        }
-//    }
-//    
-//    @MainActor
-//    func performRetryRequest(count: Int, isSuccess: Bool = false) throws {
-//        let date = "Fri, 09 Sep 2022 02:22:14 GMT"
-//        for _ in 0..<count {
-//            urlSession.expect("https://example.okta.com/oauth2/v1/token",
-//                              data: try data(filename: "token",
-//                                             matching: "APIClientTestCommon"),
-//                              statusCode: 429,
-//                              contentType: "application/json",
-//                              headerFields: ["x-rate-limit-limit": "0",
-//                                             "x-rate-limit-remaining": "0",
-//                                             "x-rate-limit-reset": "1609459200",
-//                                             "Date": "\(date)",
-//                                             "x-okta-request-id": requestId])
-//        }
-//        
-//        if isSuccess {
-//            urlSession.expect("https://example.okta.com/oauth2/v1/token",
-//                              data: try data(filename: "token",
-//                                             matching: "APIClientTestCommon"),
-//                              contentType: "application/json",
-//                              headerFields: ["Date": "\(date)",
-//                                             "x-okta-request-id": requestId])
-//        }
-//        
-//        let expect = expectation(description: "network request")
-//        apiRequest.send(to: client, completion: { result in
-//            switch result {
-//            case .success(let response):
-//                XCTAssertNotNil(response)
-//                XCTAssertEqual(response.requestId, self.requestId)
-//            case .failure(let error):
-//                XCTAssertEqual(error.errorDescription, APIClientError.statusCode(429).errorDescription)
-//            }
-//            expect.fulfill()
-//        })
-//        waitForExpectations(timeout: 9.0) { error in
-//            XCTAssertNil(error)
-//        }
-//    }
-//}
+class APIRetryTests: XCTestCase {
+    var client: MockApiClient!
+    let baseUrl = URL(string: "https://example.okta.com/oauth2/v1/token")!
+    var configuration: MockAPIClientConfiguration!
+    let urlSession = URLSessionMock()
+    var apiRequest: MockApiRequest<SampleResponse>!
+    let requestId = UUID().uuidString
+    
+    override func setUpWithError() throws {
+        configuration = MockAPIClientConfiguration(baseURL: baseUrl,
+                                                   clientId: "clientid",
+                                                   scopes: "openid")
+        client = MockApiClient(configuration: configuration,
+                               session: urlSession,
+                               baseURL: baseUrl)
+        apiRequest = MockApiRequest(url: baseUrl)
+    }
+
+    func testShouldNotRetry() throws {
+        client = MockApiClient(configuration: configuration,
+                               session: urlSession,
+                               baseURL: baseUrl,
+                               shouldRetry: .doNotRetry)
+        try performRetryRequest(count: 1)
+        XCTAssertNil(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"])
+    }
+    
+    func testDefaultRetryCount() throws {
+        try performRetryRequest(count: 4)
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "3")
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
+    }
+
+    func testApiRetryReturnsSuccessStatusCode() throws {
+        try performRetryRequest(count: 1, isSuccess: true)
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "1")
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
+    }
+    
+    func testApiRetryUsingMaximumRetryAttempt() throws {
+        try performRetryRequest(count: 3, isSuccess: true)
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "3")
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
+    }
+    
+    func testCustomRetryCount() throws {
+        client = MockApiClient(configuration: configuration,
+                               session: urlSession,
+                               baseURL: baseUrl,
+                               shouldRetry: .retry(maximumCount: 5))
+        try performRetryRequest(count: 6)
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "5")
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
+    }
+    
+    func testRetryDelegateDoNotRetry() throws {
+        let delegate = APIRetryDelegateRecorder()
+        delegate.response = .doNotRetry
+        client.delegate = delegate
+        
+        try performRetryRequest(count: 1, isSuccess: false)
+        XCTAssertEqual(delegate.requests.count, 1)
+        XCTAssertNil(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"])
+    }
+    
+    func testRetryDelegateRetry() throws {
+        let delegate = APIRetryDelegateRecorder()
+        delegate.response = .retry(maximumCount: 5)
+        client.delegate = delegate
+        
+        try performRetryRequest(count: 5, isSuccess: true)
+        XCTAssertEqual(delegate.requests.count, 1)
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-Count"], "5")
+        XCTAssertEqual(client.request?.allHTTPHeaderFields?["X-Okta-Retry-For"], requestId)
+    }
+    
+    func testApiRateLimit() throws {
+        let date = "Fri, 09 Sep 2022 02:22:14 GMT"
+        let rateLimit = APIRateLimit(with: ["x-rate-limit-limit": "0",
+                                            "x-rate-limit-remaining": "0",
+                                            "x-rate-limit-reset": "1662690193",
+                                            "Date": date])
+        XCTAssertNotNil(rateLimit?.delay)
+        XCTAssertEqual(rateLimit?.delay, 59.0)
+    }
+    
+    func testMissingResetHeader() throws {
+        urlSession.expect("https://example.okta.com/oauth2/v1/token",
+                          data: data(for: "{\"message\": \"Hello World\"}"),
+                          statusCode: 429,
+                          contentType: "application/json",
+                          headerFields: ["x-rate-limit-limit": "0",
+                                         "x-rate-limit-remaining": "0",
+                                         "x-okta-request-id": requestId])
+        
+        let expect = expectation(description: "network request")
+        apiRequest.send(to: client, completion: { result in
+            guard case .failure(let error) = result else {
+                XCTFail()
+                return
+            }
+            XCTAssertEqual(error.localizedDescription, APIClientError.statusCode(429).localizedDescription)
+            expect.fulfill()
+        })
+        
+        waitForExpectations(timeout: 1.0) { error in
+            XCTAssertNil(error)
+        }
+    }
+    
+    func performRetryRequest(count: Int, isSuccess: Bool = false) throws {
+        let date = "Fri, 09 Sep 2022 02:22:14 GMT"
+        for _ in 0..<count {
+            urlSession.expect("https://example.okta.com/oauth2/v1/token",
+                              data: data(for: "{\"message\": \"Hello World\"}"),
+                              statusCode: 429,
+                              contentType: "application/json",
+                              headerFields: ["x-rate-limit-limit": "0",
+                                             "x-rate-limit-remaining": "0",
+                                             "x-rate-limit-reset": "1609459200",
+                                             "Date": "\(date)",
+                                             "x-okta-request-id": requestId])
+        }
+        
+        if isSuccess {
+            urlSession.expect("https://example.okta.com/oauth2/v1/token",
+                              data: data(for: "{\"message\": \"Hello World\"}"),
+                              contentType: "application/json",
+                              headerFields: ["Date": "\(date)",
+                                             "x-okta-request-id": requestId])
+        }
+        
+        let expect = expectation(description: "network request")
+        apiRequest.send(to: client, completion: { result in
+            switch result {
+            case .success(let response):
+                XCTAssertNotNil(response)
+                XCTAssertEqual(response.requestId, self.requestId)
+            case .failure(let error):
+                XCTAssertEqual(error.errorDescription, APIClientError.statusCode(429).errorDescription)
+            }
+            expect.fulfill()
+        })
+        waitForExpectations(timeout: 9.0) { error in
+            XCTAssertNil(error)
+        }
+    }
+}
diff --git a/Tests/OktaOAuth2Tests/AuthorizationCodeFlowSuccessTests.swift b/Tests/OktaOAuth2Tests/AuthorizationCodeFlowSuccessTests.swift
index 9066eddb0..41b0dfe0d 100644
--- a/Tests/OktaOAuth2Tests/AuthorizationCodeFlowSuccessTests.swift
+++ b/Tests/OktaOAuth2Tests/AuthorizationCodeFlowSuccessTests.swift
@@ -104,7 +104,7 @@ final class AuthorizationCodeFlowSuccessTests: XCTestCase {
         flow.start(with: context, additionalParameters: ["foo": "bar"]) { _ in
             expect_1.fulfill()
         }
-        waitForExpectations(timeout: 1.0) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
@@ -121,7 +121,7 @@ final class AuthorizationCodeFlowSuccessTests: XCTestCase {
         try flow.resume(with: URL(string: "com.example:/callback?code=ABCEasyAs123&state=ABC123")!) { _ in
             expect_2.fulfill()
         }
-        waitForExpectations(timeout: 1.0) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
@@ -149,7 +149,7 @@ final class AuthorizationCodeFlowSuccessTests: XCTestCase {
             }
             wait_1.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         
@@ -172,7 +172,7 @@ final class AuthorizationCodeFlowSuccessTests: XCTestCase {
             }
             wait_2.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
@@ -217,7 +217,7 @@ final class AuthorizationCodeFlowSuccessTests: XCTestCase {
         flow.start(with: .init(state: "ABC123")) { _ in
             wait.fulfill()
         }
-        waitForExpectations(timeout: 1)
+        waitForExpectations(timeout: .long)
         
         XCTAssertEqual(try flow.authorizationCode(from: URL(string: "com.example:/?state=ABC123&code=foo")!), "foo")
     }
diff --git a/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowErrorTests.swift b/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowErrorTests.swift
index cce0734c8..aee99587b 100644
--- a/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowErrorTests.swift
+++ b/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowErrorTests.swift
@@ -105,7 +105,7 @@ final class DeviceAuthorizationFlowErrorTests: XCTestCase {
             }
             wait_1.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         
@@ -129,7 +129,7 @@ final class DeviceAuthorizationFlowErrorTests: XCTestCase {
             }
             wait_2.fulfill()
         }
-        waitForExpectations(timeout: 5) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
diff --git a/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowSuccessTests.swift b/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowSuccessTests.swift
index 6e408bdc2..a152ef854 100644
--- a/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowSuccessTests.swift
+++ b/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowSuccessTests.swift
@@ -71,7 +71,7 @@ final class DeviceAuthorizationFlowSuccessTests: XCTestCase {
         flow.start() { _ in
             expect_1.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
@@ -88,7 +88,7 @@ final class DeviceAuthorizationFlowSuccessTests: XCTestCase {
         flow.resume(with: context) { _ in
             expect_2.fulfill()
         }
-        waitForExpectations(timeout: 5) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         XCTAssertNil(flow.context)
@@ -114,7 +114,7 @@ final class DeviceAuthorizationFlowSuccessTests: XCTestCase {
             }
             wait_1.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         
@@ -137,7 +137,7 @@ final class DeviceAuthorizationFlowSuccessTests: XCTestCase {
             }
             wait_2.fulfill()
         }
-        waitForExpectations(timeout: 2) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
diff --git a/Tests/OktaOAuth2Tests/JWTAuthorizationFlowTests.swift b/Tests/OktaOAuth2Tests/JWTAuthorizationFlowTests.swift
index 750a8602c..ee267126e 100644
--- a/Tests/OktaOAuth2Tests/JWTAuthorizationFlowTests.swift
+++ b/Tests/OktaOAuth2Tests/JWTAuthorizationFlowTests.swift
@@ -98,7 +98,7 @@ final class JWTAuthorizationFlowTests: XCTestCase {
             expect.fulfill()
         }
         
-        waitForExpectations(timeout: 5) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         
@@ -134,7 +134,7 @@ final class JWTAuthorizationFlowTests: XCTestCase {
             
             expect.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
diff --git a/Tests/OktaOAuth2Tests/ResourceOwnerFlowTests.swift b/Tests/OktaOAuth2Tests/ResourceOwnerFlowTests.swift
index 639ad8fab..054d2e711 100644
--- a/Tests/OktaOAuth2Tests/ResourceOwnerFlowTests.swift
+++ b/Tests/OktaOAuth2Tests/ResourceOwnerFlowTests.swift
@@ -90,7 +90,7 @@ final class ResourceOwnerFlowSuccessTests: XCTestCase {
         flow.start(username: "username", password: "password") { _ in
             expect.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
@@ -116,7 +116,7 @@ final class ResourceOwnerFlowSuccessTests: XCTestCase {
             }
             wait.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         
diff --git a/Tests/OktaOAuth2Tests/SessionLogoutFlowFailureTests.swift b/Tests/OktaOAuth2Tests/SessionLogoutFlowFailureTests.swift
index 893bfaeb5..412e64496 100644
--- a/Tests/OktaOAuth2Tests/SessionLogoutFlowFailureTests.swift
+++ b/Tests/OktaOAuth2Tests/SessionLogoutFlowFailureTests.swift
@@ -59,7 +59,7 @@ class SessionLogoutFlowFailureTests: XCTestCase {
             resumeExpection.fulfill()
         }
         
-        wait(for: [resumeExpection], timeout: 1)
+        wait(for: [resumeExpection], timeout: .long)
         
         XCTAssertFalse(flow.inProgress)
         XCTAssertNil(flow.context)
diff --git a/Tests/OktaOAuth2Tests/SessionLogoutFlowSuccessTests.swift b/Tests/OktaOAuth2Tests/SessionLogoutFlowSuccessTests.swift
index f0f8fc59d..785020ccd 100644
--- a/Tests/OktaOAuth2Tests/SessionLogoutFlowSuccessTests.swift
+++ b/Tests/OktaOAuth2Tests/SessionLogoutFlowSuccessTests.swift
@@ -79,7 +79,7 @@ final class SessionLogoutFlowSuccessTests: XCTestCase {
             resumeExpection.fulfill()
         }
         
-        wait(for: [resumeExpection], timeout: 1)
+        wait(for: [resumeExpection], timeout: .long)
 
         XCTAssertEqual(delegate.url?.absoluteString, """
                             https://example.okta.com/oauth2/v1/logout\
@@ -123,7 +123,7 @@ final class SessionLogoutFlowSuccessTests: XCTestCase {
             resumeExpection.fulfill()
         }
         
-        wait(for: [resumeExpection], timeout: 1)
+        wait(for: [resumeExpection], timeout: .long)
 
         XCTAssertNil(flow.context)
         XCTAssertFalse(flow.inProgress)
@@ -152,7 +152,7 @@ final class SessionLogoutFlowSuccessTests: XCTestCase {
             resumeExpection.fulfill()
         }
         
-        wait(for: [resumeExpection], timeout: 1)
+        wait(for: [resumeExpection], timeout: .long)
     }
     
     @available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6, *)
diff --git a/Tests/OktaOAuth2Tests/SessionTokenFlowTests.swift b/Tests/OktaOAuth2Tests/SessionTokenFlowTests.swift
index 71ebd2864..7c8c70082 100644
--- a/Tests/OktaOAuth2Tests/SessionTokenFlowTests.swift
+++ b/Tests/OktaOAuth2Tests/SessionTokenFlowTests.swift
@@ -97,7 +97,7 @@ final class SessionTokenFlowSuccessTests: XCTestCase {
         flow.start(with: "theSessionToken", context: .init(state: "state")) { _ in
             expect.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
 
@@ -125,7 +125,7 @@ final class SessionTokenFlowSuccessTests: XCTestCase {
             }
             wait.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         
diff --git a/Tests/OktaOAuth2Tests/TokenExchangeFlowTests.swift b/Tests/OktaOAuth2Tests/TokenExchangeFlowTests.swift
index a1391f1c1..877ff648e 100644
--- a/Tests/OktaOAuth2Tests/TokenExchangeFlowTests.swift
+++ b/Tests/OktaOAuth2Tests/TokenExchangeFlowTests.swift
@@ -97,7 +97,7 @@ final class TokenExchangeFlowTests: XCTestCase {
             expect.fulfill()
         }
         
-        waitForExpectations(timeout: 5) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }
         
@@ -133,7 +133,7 @@ final class TokenExchangeFlowTests: XCTestCase {
             
             expect.fulfill()
         }
-        waitForExpectations(timeout: 1) { error in
+        waitForExpectations(timeout: .long) { error in
             XCTAssertNil(error)
         }