diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a23541f..f9a3e62 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,35 +9,28 @@ on:
   pull_request:
     branches:
       - main
-  push:
-    branches:
-      - main
 
 jobs:
-  swiftlint:
-    runs-on: ubuntu-latest
-    container:
-      image: swift:5.10-noble
+  lint:
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set Up swiftlint
-        run: |
-          sudo apt-get update && sudo apt-get install -y unzip curl
-          unzip ci/swiftlint.zip -d /usr/local/bin/
-          chmod +x /usr/local/bin/swiftlint
-      - name: Lint Using swiftlint
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set Up SwiftLint
+        run: brew install swiftlint
+
+      - name: Lint Using SwiftLint
         run: swiftlint lint --strict .
 
-  swiftformat:
-    runs-on: ubuntu-latest
-    container:
-      image: swift:5.10-noble
+  format:
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set Up swiftformat
-        run: |
-          sudo apt-get update && sudo apt-get install -y unzip curl
-          unzip ci/swiftformat.zip -d /usr/local/bin/
-          chmod +x /usr/local/bin/swiftformat
-      - name: Lint Using swiftformat
-        run: swiftformat --lint .
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set Up swift-format
+        run: brew install swift-format
+
+      - name: Lint Using swift-format
+        run: swift format lint -r .
\ No newline at end of file
diff --git a/.swift-format b/.swift-format
new file mode 100644
index 0000000..ca3eb42
--- /dev/null
+++ b/.swift-format
@@ -0,0 +1,7 @@
+{
+  "version": 1,
+  "lineLength": 120,
+  "indentation": {
+    "spaces": 4
+  }
+}
\ No newline at end of file
diff --git a/.swiftformat b/.swiftformat
deleted file mode 100644
index b617f3f..0000000
--- a/.swiftformat
+++ /dev/null
@@ -1,2 +0,0 @@
---disable wrapMultilineStatementBraces
---commas inline
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 8fd1f55..31bfe38 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -6,5 +6,6 @@ disabled_rules:
   - function_body_length
   - file_length
   - non_optional_string_data_conversion
+  - trailing_comma
 excluded:
   - .build
diff --git a/Package.swift b/Package.swift
index 4192f0f..2182228 100644
--- a/Package.swift
+++ b/Package.swift
@@ -6,7 +6,7 @@ let package = Package(
     name: "VoltaserveCore",
     platforms: [
         .iOS(.v13),
-        .macOS(.v12)
+        .macOS(.v12),
     ],
     products: [
         .library(
@@ -24,6 +24,6 @@ let package = Package(
             dependencies: ["VoltaserveCore"],
             path: "Tests",
             resources: [.process("Resources")]
-        )
+        ),
     ]
 )
diff --git a/Sources/Account.swift b/Sources/Account.swift
index 4dc43df..e3ca68c 100644
--- a/Sources/Account.swift
+++ b/Sources/Account.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Common/Error.swift b/Sources/Common/Error.swift
index b4a344c..900a77b 100644
--- a/Sources/Common/Error.swift
+++ b/Sources/Common/Error.swift
@@ -21,7 +21,7 @@ public struct VOErrorResponse: Decodable, Error {
     }
 
     public enum Code: String, Codable, CaseIterable {
-        /* API */
+        // API
         case groupNotFound = "group_not_found"
         case fileNotFound = "file_not_found"
         case invalidPath = "invalid_path"
@@ -71,7 +71,7 @@ public struct VOErrorResponse: Decodable, Error {
         case invalidApiKey = "invalid_api_key"
         case pathVariablesAndBodyParametersNotConsistent = "path_variables_and_body_parameters_not_consistent"
 
-        /* IdP */
+        // IdP
         case usernameUnavailable = "username_unavailable"
         case resourceNotFound = "resource_not_found"
         case invalidUsernameOrPassword = "invalid_username_or_password"
@@ -84,11 +84,11 @@ public struct VOErrorResponse: Decodable, Error {
         case unsupportedGrantType = "unsupported_grant_type"
         case passwordValidationFailed = "password_validation_failed"
 
-        /* Common */
+        // Common
         case internalServerError = "internal_server_error"
         case requestValidationError = "request_validation_error"
 
-        /* Unexpected */
+        // Unexpected
         case unknown
 
         public init(rawValue: String) {
diff --git a/Sources/Common/Request.swift b/Sources/Common/Request.swift
index e716c20..f80aa53 100644
--- a/Sources/Common/Request.swift
+++ b/Sources/Common/Request.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
@@ -30,7 +31,7 @@ func handleJSONResponse<T: Decodable>(
             return
         }
         let stringData = String(data: data, encoding: .utf8)
-        if (200 ... 299).contains(httpResponse.statusCode) {
+        if (200...299).contains(httpResponse.statusCode) {
             do {
                 let result = try JSONDecoder().decode(T.self, from: data)
                 continuation.resume(returning: result)
@@ -44,6 +45,7 @@ func handleJSONResponse<T: Decodable>(
             }
         } else {
             if let stringData {
+                // swift-format-ignore
                 // swiftlint:disable:next line_length
                 print("Request to URL: \(httpResponse.url!), failed with status code: \(httpResponse.statusCode), data: \(stringData)")
             } else {
@@ -71,7 +73,7 @@ func handleDataResponse(
             continuation.resume(throwing: VONoDataError())
             return
         }
-        if (200 ... 299).contains(httpResponse.statusCode) {
+        if (200...299).contains(httpResponse.statusCode) {
             continuation.resume(returning: data)
         } else {
             handleErrorResponse(continuation: continuation, data: data)
@@ -96,7 +98,7 @@ func handleEmptyResponse(
             continuation.resume(throwing: VONoDataError())
             return
         }
-        if (200 ... 299).contains(httpResponse.statusCode) {
+        if (200...299).contains(httpResponse.statusCode) {
             continuation.resume()
         } else {
             handleErrorResponse(continuation: continuation, data: data)
diff --git a/Sources/Common/URLRequest+AuthHeader.swift b/Sources/Common/URLRequest+AuthHeader.swift
index 26e495f..cc99ee2 100644
--- a/Sources/Common/URLRequest+AuthHeader.swift
+++ b/Sources/Common/URLRequest+AuthHeader.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Common/URLRequest+JSON.swift b/Sources/Common/URLRequest+JSON.swift
index 417fbc8..7b0a87c 100644
--- a/Sources/Common/URLRequest+JSON.swift
+++ b/Sources/Common/URLRequest+JSON.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/File+Wait.swift b/Sources/File+Wait.swift
index 43e00bb..63632f1 100644
--- a/Sources/File+Wait.swift
+++ b/Sources/File+Wait.swift
@@ -5,8 +5,8 @@
 
 import Foundation
 
-public extension VOFile {
-    func wait(_ id: String, sleepSeconds: UInt32 = 1) async throws -> Entity {
+extension VOFile {
+    public func wait(_ id: String, sleepSeconds: UInt32 = 1) async throws -> Entity {
         var file: Entity
         repeat {
             file = try await fetch(id)
diff --git a/Sources/File.swift b/Sources/File.swift
index 71f7a76..9350691 100644
--- a/Sources/File.swift
+++ b/Sources/File.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
@@ -132,11 +133,12 @@ public struct VOFile {
 
     public func fetchSegmentedThumbnail(_ id: String, page: Int, fileExtension: String) async throws -> Data {
         try await withCheckedThrowingContinuation { continuation in
-            var request = URLRequest(url: urlForSegmentedThumbnail(
-                id,
-                page: page,
-                fileExtension: String(fileExtension.dropFirst())
-            ))
+            var request = URLRequest(
+                url: urlForSegmentedThumbnail(
+                    id,
+                    page: page,
+                    fileExtension: String(fileExtension.dropFirst())
+                ))
             request.httpMethod = "GET"
             request.appendAuthorizationHeader(accessToken)
             let task = URLSession.shared.dataTask(with: request) { data, response, error in
@@ -526,7 +528,7 @@ public struct VOFile {
         urlComponents.queryItems = [
             .init(name: "type", value: FileType.file.rawValue),
             .init(name: "workspace_id", value: options.workspaceID),
-            .init(name: "name", value: options.name)
+            .init(name: "name", value: options.name),
         ]
         if let parentID = options.parentID {
             urlComponents.queryItems?.append(.init(name: "parent_id", value: parentID))
@@ -540,7 +542,7 @@ public struct VOFile {
         urlComponents.queryItems = [
             .init(name: "type", value: FileType.folder.rawValue),
             .init(name: "workspace_id", value: options.workspaceID),
-            .init(name: "name", value: options.name)
+            .init(name: "name", value: options.name),
         ]
         if let parentID = options.parentID {
             urlComponents.queryItems?.append(URLQueryItem(name: "parent_id", value: parentID))
@@ -550,28 +552,23 @@ public struct VOFile {
     }
 
     public func urlForOriginal(_ id: String, fileExtension: String) -> URL {
-        URL(string: "\(urlForID(id))/original.\(fileExtension)?" +
-            "access_token=\(accessToken)")!
+        URL(string: "\(urlForID(id))/original.\(fileExtension)?access_token=\(accessToken)")!
     }
 
     public func urlForPreview(_ id: String, fileExtension: String) -> URL {
-        URL(string: "\(urlForID(id))/preview.\(fileExtension)?" +
-            "access_token=\(accessToken)")!
+        URL(string: "\(urlForID(id))/preview.\(fileExtension)?access_token=\(accessToken)")!
     }
 
     public func urlForThumbnail(_ id: String, fileExtension: String) -> URL {
-        URL(string: "\(urlForID(id))/thumbnail.\(fileExtension)?" +
-            "access_token=\(accessToken)")!
+        URL(string: "\(urlForID(id))/thumbnail.\(fileExtension)?access_token=\(accessToken)")!
     }
 
     public func urlForSegmentedPage(_ id: String, page: Int, fileExtension: String) -> URL {
-        URL(string: "\(urlForID(id))/segmentation/pages/\(page).\(fileExtension)?" +
-            "access_token=\(accessToken)")!
+        URL(string: "\(urlForID(id))/segmentation/pages/\(page).\(fileExtension)?access_token=\(accessToken)")!
     }
 
     public func urlForSegmentedThumbnail(_ id: String, page: Int, fileExtension: String) -> URL {
-        URL(string: "\(urlForID(id))/segmentation/thumbnails/\(page).\(fileExtension)?" +
-            "access_token=\(accessToken)")!
+        URL(string: "\(urlForID(id))/segmentation/thumbnails/\(page).\(fileExtension)?access_token=\(accessToken)")!
     }
 
     public func urlForUserPermissions(_ id: String) -> URL {
diff --git a/Sources/Group.swift b/Sources/Group.swift
index 8a293ec..2207905 100644
--- a/Sources/Group.swift
+++ b/Sources/Group.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Insights.swift b/Sources/Insights.swift
index 125b098..e495d49 100644
--- a/Sources/Insights.swift
+++ b/Sources/Insights.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Invitation.swift b/Sources/Invitation.swift
index 78377c5..c879f50 100644
--- a/Sources/Invitation.swift
+++ b/Sources/Invitation.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Mosaic.swift b/Sources/Mosaic.swift
index 0a2a913..301144b 100644
--- a/Sources/Mosaic.swift
+++ b/Sources/Mosaic.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
@@ -44,13 +45,14 @@ public struct VOMosaic {
         fileExtension: String
     ) async throws -> Data {
         try await withCheckedThrowingContinuation { continuation in
-            var request = URLRequest(url: urlForTile(
-                id,
-                zoomLevel: zoomLevel,
-                row: row,
-                column: column,
-                fileExtension: fileExtension
-            ))
+            var request = URLRequest(
+                url: urlForTile(
+                    id,
+                    zoomLevel: zoomLevel,
+                    row: row,
+                    column: column,
+                    fileExtension: fileExtension
+                ))
             request.httpMethod = "GET"
             request.appendAuthorizationHeader(accessToken)
             let task = URLSession.shared.dataTask(with: request) { data, response, error in
@@ -122,9 +124,9 @@ public struct VOMosaic {
         column: Int,
         fileExtension: String
     ) -> URL {
-        URL(string: "\(urlForFile(id))/zoom_level/\(zoomLevel.index)" +
-            "/row/\(row)/column/\(column)/extension/\(fileExtension)?" +
-            "access_token=\(accessToken)")!
+        // swift-format-ignore
+        // swiftlint:disable:next line_length
+        URL(string: "\(urlForFile(id))/zoom_level/\(zoomLevel.index)/row/\(row)/column/\(column)/extension/\(fileExtension)?access_token=\(accessToken)")!
     }
 
     // MARK: - Types
diff --git a/Sources/Organization.swift b/Sources/Organization.swift
index 50a19b8..53e8f2c 100644
--- a/Sources/Organization.swift
+++ b/Sources/Organization.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Permission.swift b/Sources/Permission.swift
index ecd61f3..ddf058f 100644
--- a/Sources/Permission.swift
+++ b/Sources/Permission.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Snapshot.swift b/Sources/Snapshot.swift
index 1d99a14..f7fa9d5 100644
--- a/Sources/Snapshot.swift
+++ b/Sources/Snapshot.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Storage.swift b/Sources/Storage.swift
index 1b30a64..7ffcb4e 100644
--- a/Sources/Storage.swift
+++ b/Sources/Storage.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Task+Wait.swift b/Sources/Task+Wait.swift
index 65e686a..8361d08 100644
--- a/Sources/Task+Wait.swift
+++ b/Sources/Task+Wait.swift
@@ -5,8 +5,8 @@
 
 import Foundation
 
-public extension VOTask {
-    func wait(_ id: String, sleepSeconds: UInt32 = 1) async throws -> Entity? {
+extension VOTask {
+    public func wait(_ id: String, sleepSeconds: UInt32 = 1) async throws -> Entity? {
         var task: Entity?
         repeat {
             do {
@@ -30,7 +30,7 @@ public extension VOTask {
         return task
     }
 
-    enum RuntimeError: Error {
+    public enum RuntimeError: Error {
         case message(String)
     }
 }
diff --git a/Sources/Task.swift b/Sources/Task.swift
index c08e9f9..2eba0bd 100644
--- a/Sources/Task.swift
+++ b/Sources/Task.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Token.swift b/Sources/Token.swift
index c5ecba0..213eb56 100644
--- a/Sources/Token.swift
+++ b/Sources/Token.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
@@ -90,7 +91,8 @@ public struct VOToken {
 
             // Explicitly replace spaces with + and encode & characters
             var percentEncodedQuery = components.percentEncodedQuery ?? ""
-            percentEncodedQuery = percentEncodedQuery
+            percentEncodedQuery =
+                percentEncodedQuery
                 .replacingOccurrences(of: "+", with: "%2B")
                 .replacingOccurrences(of: "%20", with: "+")
             return percentEncodedQuery
diff --git a/Sources/User.swift b/Sources/User.swift
index e652db7..521f76b 100644
--- a/Sources/User.swift
+++ b/Sources/User.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Sources/Workspace.swift b/Sources/Workspace.swift
index 20b650b..806b45b 100644
--- a/Sources/Workspace.swift
+++ b/Sources/Workspace.swift
@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
diff --git a/Tests/AccountTests.swift b/Tests/AccountTests.swift
index b49518d..2d7130a 100644
--- a/Tests/AccountTests.swift
+++ b/Tests/AccountTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class AccountTests: XCTestCase {
     var factory: DisposableFactory?
 
diff --git a/Tests/Common/TokenFactory.swift b/Tests/Common/TokenFactory.swift
index 59a9921..e987438 100644
--- a/Tests/Common/TokenFactory.swift
+++ b/Tests/Common/TokenFactory.swift
@@ -14,12 +14,13 @@ class TokenFactory {
     }
 
     init(_ credentials: Config.Credentials) async throws {
-        value = try await VOToken(baseURL: config.idpURL).exchange(.init(
-            grantType: .password,
-            username: credentials.username,
-            password: credentials.password,
-            refreshToken: nil,
-            locale: nil
-        ))
+        value = try await VOToken(baseURL: config.idpURL).exchange(
+            .init(
+                grantType: .password,
+                username: credentials.username,
+                password: credentials.password,
+                refreshToken: nil,
+                locale: nil
+            ))
     }
 }
diff --git a/Tests/Common/XCTestCase+Bundle.swift b/Tests/Common/XCTestCase+Bundle.swift
index f0791d0..f15437e 100644
--- a/Tests/Common/XCTestCase+Bundle.swift
+++ b/Tests/Common/XCTestCase+Bundle.swift
@@ -11,10 +11,11 @@ extension XCTestCase {
         #if os(Linux)
             URL(fileURLWithPath: "Tests/Resources/\(resource).\(fileExtension)")
         #else
-            Bundle(url: Bundle(for: type(of: self)).url(
-                forResource: "VoltaserveCore_VoltaserveTests",
-                withExtension: "bundle"
-            )!)!.url(forResource: resource, withExtension: fileExtension)
+            Bundle(
+                url: Bundle(for: type(of: self)).url(
+                    forResource: "VoltaserveCore_VoltaserveTests",
+                    withExtension: "bundle"
+                )!)!.url(forResource: resource, withExtension: fileExtension)
         #endif
     }
 }
diff --git a/Tests/FileTests.swift b/Tests/FileTests.swift
index b7228b1..23cccf6 100644
--- a/Tests/FileTests.swift
+++ b/Tests/FileTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class FileTests: XCTestCase {
     var factory: DisposableFactory?
     var otherFactory: DisposableFactory?
@@ -19,36 +20,38 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
-        /* Create files */
+        // Create files
         var options: [VOFile.CreateFileOptions] = []
-        for index in 0 ..< 6 {
-            options.append(.init(
-                workspaceID: workspace.id,
-                name: "Test File \(index).txt",
-                data: Data("Test Content \(index)".utf8)
-            ))
+        for index in 0..<6 {
+            options.append(
+                .init(
+                    workspaceID: workspace.id,
+                    name: "Test File \(index).txt",
+                    data: Data("Test Content \(index)".utf8)
+                ))
         }
         var files: [VOFile.Entity] = []
-        for index in 0 ..< options.count {
+        for index in 0..<options.count {
             try await files.append(factory.file(options[index]))
         }
 
-        /* Test creation */
-        for index in 0 ..< files.count {
+        // Test creation
+        for index in 0..<files.count {
             XCTAssertEqual(files[index].name, options[index].name)
             XCTAssertEqual(files[index].workspaceID, options[index].workspaceID)
             XCTAssertEqual(files[index].permission, .owner)
         }
 
-        /* Test list */
+        // Test list
 
-        /* Page 1 */
+        // Page 1
         let page1 = try await client.fetchList(workspace.rootID, options: .init(page: 1, size: 3))
         XCTAssertGreaterThanOrEqual(page1.totalElements, options.count)
         XCTAssertEqual(page1.totalPages, 2)
@@ -56,28 +59,28 @@ final class FileTests: XCTestCase {
         XCTAssertEqual(page1.size, 3)
         XCTAssertEqual(page1.data.count, page1.size)
 
-        /* Page 2 */
+        // Page 2
         let page2 = try await client.fetchList(workspace.rootID, options: .init(page: 2, size: 3))
         XCTAssertGreaterThanOrEqual(page2.totalElements, options.count)
         XCTAssertEqual(page2.page, 2)
         XCTAssertEqual(page2.size, 3)
         XCTAssertEqual(page2.data.count, page2.size)
 
-        /* Test fetch */
+        // Test fetch
         let file = try await client.fetch(files[0].id)
         XCTAssertEqual(file.name, files[0].name)
         XCTAssertEqual(file.workspaceID, files[0].workspaceID)
         XCTAssertEqual(file.permission, .owner)
         XCTAssertEqual(file.snapshot!.original.size!, options[0].data.count)
 
-        /* Test patch name */
+        // Test patch name
         let newName = "New File.txt"
         let resultAlpha = try await client.patchName(file.id, options: .init(name: newName))
         XCTAssertEqual(resultAlpha.name, newName)
         let fileAlpha = try await client.fetch(file.id)
         XCTAssertEqual(fileAlpha.name, newName)
 
-        /* Test delete */
+        // Test delete
         for file in files {
             try await client.delete(file.id)
         }
@@ -110,43 +113,45 @@ final class FileTests: XCTestCase {
         let otherClient = otherFactory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
         let folder = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder"))
 
-        /* Send invitation and accept it */
+        // Send invitation and accept it
         let otherUser = try await otherFactory.client.identityUser.fetch()
-        let invitations = try await factory.client.invitation.create(.init(
-            organizationID: organization.id,
-            emails: [otherUser.email]
-        ))
+        let invitations = try await factory.client.invitation.create(
+            .init(
+                organizationID: organization.id,
+                emails: [otherUser.email]
+            ))
         try await otherFactory.client.invitation.accept(invitations[0].id)
 
-        /* Grant permission to the other user */
+        // Grant permission to the other user
         try await client.grantUserPermission(.init(ids: [folder.id], userID: otherUser.id, permission: .editor))
 
-        /* Test the other user has the permission */
+        // Test the other user has the permission
         let permissions = try await client.fetchUserPermissions(folder.id)
         XCTAssertEqual(permissions.count, 1)
         XCTAssertEqual(permissions.first!.user.id, otherUser.id)
         XCTAssertEqual(permissions.first!.permission, .editor)
 
-        /* Test the other user can access the file */
+        // Test the other user can access the file
         let folderAgain = try await otherClient.fetch(folder.id)
         XCTAssertEqual(folderAgain.id, folder.id)
         XCTAssertEqual(folderAgain.permission, .editor)
 
-        /* Revoke permission from the other user */
+        // Revoke permission from the other user
         try await client.revokeUserPermission(.init(ids: [folder.id], userID: otherUser.id))
 
-        /* Test the other user no longer has the permission */
+        // Test the other user no longer has the permission
         let newPermissions = try await client.fetchUserPermissions(folder.id)
         XCTAssertEqual(newPermissions.count, 0)
 
-        /* Test the other user can no longer access the file */
+        // Test the other user can no longer access the file
         do {
             _ = try await otherClient.fetch(folder.id)
             expectedToFail()
@@ -174,47 +179,49 @@ final class FileTests: XCTestCase {
         let otherClient = otherFactory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
         let group = try await factory.group(.init(name: "Test Group", organizationID: organization.id))
         let folder = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder"))
 
-        /* Send invitation and accept it */
+        // Send invitation and accept it
         let otherUser = try await otherFactory.client.identityUser.fetch()
-        let invitations = try await factory.client.invitation.create(.init(
-            organizationID: organization.id,
-            emails: [otherUser.email]
-        ))
+        let invitations = try await factory.client.invitation.create(
+            .init(
+                organizationID: organization.id,
+                emails: [otherUser.email]
+            ))
         try await otherFactory.client.invitation.accept(invitations[0].id)
 
-        /* Add the other user to the group */
+        // Add the other user to the group
         try await factory.client.group.addMember(group.id, options: .init(userID: otherUser.id))
 
-        /* Grant permission to the group */
+        // Grant permission to the group
         try await client.grantGroupPermission(.init(ids: [folder.id], groupID: group.id, permission: .editor))
 
-        /* Test the group has the permission */
+        // Test the group has the permission
         let permissions = try await client.fetchGroupPermissions(folder.id)
         XCTAssertEqual(permissions.count, 1)
         XCTAssertEqual(permissions.first?.group.id, group.id)
         XCTAssertEqual(permissions.first?.permission, .editor)
 
-        /* Test the other user can access the file */
+        // Test the other user can access the file
         let folderAgain = try await otherClient.fetch(folder.id)
         XCTAssertEqual(folderAgain.id, folder.id)
         XCTAssertEqual(folderAgain.permission, .editor)
 
-        /* Revoke permission from the group */
+        // Revoke permission from the group
         try await client.revokeGroupPermission(.init(ids: [folder.id], groupID: group.id))
 
-        /* Test the group no longer has the permission */
+        // Test the group no longer has the permission
         let newPermissions = try await client.fetchGroupPermissions(folder.id)
         XCTAssertEqual(newPermissions.count, 0)
 
-        /* Test the other user can no longer access the file */
+        // Test the other user can no longer access the file
         do {
             _ = try await otherClient.fetch(folder.id)
             expectedToFail()
@@ -234,26 +241,30 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-
-        let folderA = try await factory.folder(.init(
-            workspaceID: workspace.id,
-            name: "Test Folder A"
-        ))
-        let folderB = try await factory.folder(.init(
-            workspaceID: workspace.id,
-            parentID: folderA.id,
-            name: "Test Folder B"
-        ))
-        let folderC = try await factory.folder(.init(
-            workspaceID: workspace.id,
-            parentID: folderB.id,
-            name: "Test Folder C"
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+
+        let folderA = try await factory.folder(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test Folder A"
+            ))
+        let folderB = try await factory.folder(
+            .init(
+                workspaceID: workspace.id,
+                parentID: folderA.id,
+                name: "Test Folder B"
+            ))
+        let folderC = try await factory.folder(
+            .init(
+                workspaceID: workspace.id,
+                parentID: folderB.id,
+                name: "Test Folder C"
+            ))
 
         let path = try await client.fetchPath(folderC.id)
         XCTAssertEqual(path.count, 4)
@@ -268,13 +279,14 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
-        for index in 0 ..< 3 {
+        for index in 0..<3 {
             _ = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder \(index)"))
         }
 
@@ -291,14 +303,15 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         var ids = [String]()
-        for index in 0 ..< 3 {
+        for index in 0..<3 {
             let folder = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder \(index)"))
             ids.append(folder.id)
         }
@@ -325,24 +338,26 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data("Test Content".utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data("Test Content".utf8)
+            ))
         let folder = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder"))
 
         let copiedFile = try await client.copy(file.id, to: folder.id)
         XCTAssertEqual(copiedFile.name, file.name)
         XCTAssertEqual(copiedFile.parentID, folder.id)
 
-        /* Check the copied file name has a suffix that makes it unique */
+        // Check the copied file name has a suffix that makes it unique
         let copiedFileAgain = try await client.copy(file.id, to: workspace.rootID)
         XCTAssertNotEqual(file.name, copiedFileAgain.name)
         let lhs = (copiedFileAgain.name as NSString).deletingPathExtension
@@ -359,19 +374,22 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         var files: [VOFile.Entity] = []
-        for index in 0 ..< 3 {
-            try await files.append(factory.file(.init(
-                workspaceID: workspace.id,
-                name: "Test File \(index).txt",
-                data: Data("Test Content \(index)".utf8)
-            )))
+        for index in 0..<3 {
+            try await files.append(
+                factory.file(
+                    .init(
+                        workspaceID: workspace.id,
+                        name: "Test File \(index).txt",
+                        data: Data("Test Content \(index)".utf8)
+                    )))
         }
         let folder = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder"))
 
@@ -390,28 +408,31 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data("Test Content".utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data("Test Content".utf8)
+            ))
         let folder = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder"))
 
         let movedFile = try await client.move(file.id, to: folder.id)
         XCTAssertEqual(movedFile.parentID, folder.id)
 
         do {
-            _ = try await factory.file(.init(
-                workspaceID: workspace.id,
-                name: "Test File.txt",
-                data: Data("Test Content".utf8)
-            ))
+            _ = try await factory.file(
+                .init(
+                    workspaceID: workspace.id,
+                    name: "Test File.txt",
+                    data: Data("Test Content".utf8)
+                ))
             _ = try await client.move(file.id, to: workspace.rootID)
             expectedToFail()
         } catch let error as VOErrorResponse {
@@ -430,19 +451,22 @@ final class FileTests: XCTestCase {
         let client = factory.client.file
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         var files: [VOFile.Entity] = []
-        for index in 0 ..< 3 {
-            try await files.append(factory.file(.init(
-                workspaceID: workspace.id,
-                name: "Test File \(index).txt",
-                data: Data("Test Content \(index)".utf8)
-            )))
+        for index in 0..<3 {
+            try await files.append(
+                factory.file(
+                    .init(
+                        workspaceID: workspace.id,
+                        name: "Test File \(index).txt",
+                        data: Data("Test Content \(index)".utf8)
+                    )))
         }
         let folder = try await factory.folder(.init(workspaceID: workspace.id, name: "Test Folder"))
 
diff --git a/Tests/GroupTests.swift b/Tests/GroupTests.swift
index 4878c38..b01c60a 100644
--- a/Tests/GroupTests.swift
+++ b/Tests/GroupTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class GroupTests: XCTestCase {
     var factory: DisposableFactory?
 
@@ -19,25 +20,25 @@ final class GroupTests: XCTestCase {
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
 
-        /* Create groups */
+        // Create groups
         var options: [VOGroup.CreateOptions] = []
-        for index in 0 ..< 6 {
+        for index in 0..<6 {
             options.append(.init(name: "Test Group \(index)", organizationID: organization.id))
         }
         var groups: [VOGroup.Entity] = []
-        for index in 0 ..< options.count {
+        for index in 0..<options.count {
             try await groups.append(factory.group(options[index]))
         }
 
-        /* Test creation */
-        for index in 0 ..< groups.count {
+        // Test creation
+        for index in 0..<groups.count {
             XCTAssertEqual(groups[index].name, options[index].name)
             XCTAssertEqual(groups[index].organization.id, options[index].organizationID)
         }
 
-        /* Test list */
+        // Test list
 
-        /* Page 1 */
+        // Page 1
         let page1 = try await client.fetchList(.init(page: 1, size: 3))
         XCTAssertGreaterThanOrEqual(page1.totalElements, options.count)
         XCTAssertGreaterThanOrEqual(page1.totalPages, 2)
@@ -45,26 +46,26 @@ final class GroupTests: XCTestCase {
         XCTAssertEqual(page1.size, 3)
         XCTAssertEqual(page1.data.count, page1.size)
 
-        /* Page 2 */
+        // Page 2
         let page2 = try await client.fetchList(.init(page: 2, size: 3))
         XCTAssertGreaterThanOrEqual(page2.totalElements, options.count)
         XCTAssertEqual(page2.page, 2)
         XCTAssertEqual(page2.size, 3)
         XCTAssertEqual(page2.data.count, page2.size)
 
-        /* Test fetch */
+        // Test fetch
         let group = try await client.fetch(groups[0].id)
         XCTAssertEqual(group.name, groups[0].name)
         XCTAssertEqual(group.organization.id, groups[0].organization.id)
 
-        /* Test patch name */
+        // Test patch name
         let newName = "New Group"
         let alpha = try await client.patchName(group.id, options: .init(name: newName))
         XCTAssertEqual(alpha.name, newName)
         let beta = try await client.fetch(group.id)
         XCTAssertEqual(beta.name, newName)
 
-        /* Test delete */
+        // Test delete
         for group in groups {
             try await client.delete(group.id)
         }
diff --git a/Tests/InsightsTests.swift b/Tests/InsightsTests.swift
index bba3562..0e078fb 100644
--- a/Tests/InsightsTests.swift
+++ b/Tests/InsightsTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class InsightsTests: XCTestCase {
     var factory: DisposableFactory?
 
@@ -18,17 +19,19 @@ final class InsightsTests: XCTestCase {
         let client = factory.client.insights
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data(Constants.text.utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data(Constants.text.utf8)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         let task = try await client.create(file.id, options: .init(languageID: "eng"))
@@ -48,17 +51,19 @@ final class InsightsTests: XCTestCase {
         let client = factory.client.insights
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data(Constants.text.utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data(Constants.text.utf8)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         let task = try await client.create(file.id, options: .init(languageID: "eng"))
@@ -92,17 +97,19 @@ final class InsightsTests: XCTestCase {
         let client = factory.client.insights
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data(Constants.text.utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data(Constants.text.utf8)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         var task = try await client.create(file.id, options: .init(languageID: "eng"))
@@ -111,7 +118,7 @@ final class InsightsTests: XCTestCase {
         var info = try await client.fetchInfo(file.id)
         XCTAssertFalse(info.isOutdated)
 
-        /* Patch file to get a new snapshot and make the insights "outdated" */
+        // Patch file to get a new snapshot and make the insights "outdated"
         _ = try await factory.client.file.patch(
             file.id,
             options: .init(data: Data(Constants.text.utf8), name: file.name)
@@ -121,11 +128,11 @@ final class InsightsTests: XCTestCase {
         info = try await client.fetchInfo(file.id)
         XCTAssertTrue(info.isOutdated)
 
-        /* Patch insights */
+        // Patch insights
         task = try await client.patch(file.id)
         _ = try await factory.client.task.wait(task.id)
 
-        /* Check if no longer "outdated" */
+        // Check if no longer "outdated"
         info = try await client.fetchInfo(file.id)
         XCTAssertFalse(info.isOutdated)
     }
@@ -139,16 +146,18 @@ final class InsightsTests: XCTestCase {
         let client = factory.client.insights
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data(Constants.text.utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data(Constants.text.utf8)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         var task = try await client.create(file.id, options: .init(languageID: "eng"))
@@ -172,8 +181,8 @@ final class InsightsTests: XCTestCase {
     enum Constants {
         // swiftlint:disable line_length
         static let text = """
-        William Shakespeare was an English playwright, poet and actor. He is widely regarded as the greatest writer in the English language and the world's pre-eminent dramatist. He is often called England's national poet and the "Bard of Avon" (or simply "the Bard"). His extant works, including collaborations, consist of some 39 plays, 154 sonnets, three long narrative poems and a few other verses, some of uncertain authorship. His plays have been translated into every major living language and are performed more often than those of any other playwright. Shakespeare remains arguably the most influential writer in the English language, and his works continue to be studied and reinterpreted.
-        """
+            William Shakespeare was an English playwright, poet and actor. He is widely regarded as the greatest writer in the English language and the world's pre-eminent dramatist. He is often called England's national poet and the "Bard of Avon" (or simply "the Bard"). His extant works, including collaborations, consist of some 39 plays, 154 sonnets, three long narrative poems and a few other verses, some of uncertain authorship. His plays have been translated into every major living language and are performed more often than those of any other playwright. Shakespeare remains arguably the most influential writer in the English language, and his works continue to be studied and reinterpreted.
+            """
         // swiftlint:enable line_length
     }
 }
diff --git a/Tests/InvitationTests.swift b/Tests/InvitationTests.swift
index e5a2bcf..b7b3d82 100644
--- a/Tests/InvitationTests.swift
+++ b/Tests/InvitationTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class InvitationTests: XCTestCase {
     var factory: DisposableFactory?
     var otherFactory: DisposableFactory?
@@ -78,10 +79,11 @@ final class InvitationTests: XCTestCase {
         let organization = try await factory.organization(.init(name: "Test Organization"))
         let otherUser = try await otherFactory.client.identityUser.fetch()
 
-        let invitations = try await client.create(.init(
-            organizationID: organization.id,
-            emails: [otherUser.email]
-        ))
+        let invitations = try await client.create(
+            .init(
+                organizationID: organization.id,
+                emails: [otherUser.email]
+            ))
         try await client.delete(invitations[0].id)
         let outgoing = try await otherClient.fetchIncomingList(.init())
         XCTAssertEqual(outgoing.totalElements, 0)
@@ -106,10 +108,11 @@ final class InvitationTests: XCTestCase {
         let organization = try await factory.organization(.init(name: "Test Organization"))
         let otherUser = try await otherFactory.client.identityUser.fetch()
 
-        let invitations = try await client.create(.init(
-            organizationID: organization.id,
-            emails: [otherUser.email]
-        ))
+        let invitations = try await client.create(
+            .init(
+                organizationID: organization.id,
+                emails: [otherUser.email]
+            ))
 
         try await otherClient.accept(invitations.first!.id)
         let organizationMembers = try await factory.client.user.fetchList(.init(organizationID: organization.id))
@@ -141,10 +144,11 @@ final class InvitationTests: XCTestCase {
         let organization = try await factory.organization(.init(name: "Test Organization"))
         let otherUser = try await otherFactory.client.identityUser.fetch()
 
-        let invitations = try await client.create(.init(
-            organizationID: organization.id,
-            emails: [otherUser.email]
-        ))
+        let invitations = try await client.create(
+            .init(
+                organizationID: organization.id,
+                emails: [otherUser.email]
+            ))
         try await otherClient.decline(invitations[0].id)
 
         let incoming = try await otherClient.fetchIncomingList(.init())
diff --git a/Tests/MosaicTests.swift b/Tests/MosaicTests.swift
index 3b1ece7..d9925b5 100644
--- a/Tests/MosaicTests.swift
+++ b/Tests/MosaicTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class MosaicTests: XCTestCase {
     var factory: DisposableFactory?
 
@@ -18,16 +19,18 @@ final class MosaicTests: XCTestCase {
         let client = factory.client.mosaic
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "image.jpg",
-            data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "jpg")!)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "image.jpg",
+                data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "jpg")!)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         let task = try await client.create(file.id)
@@ -46,16 +49,18 @@ final class MosaicTests: XCTestCase {
         let client = factory.client.mosaic
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "image.png",
-            data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "png")!)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "image.png",
+                data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "png")!)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         let task = try await client.create(file.id)
@@ -74,16 +79,18 @@ final class MosaicTests: XCTestCase {
         let client = factory.client.mosaic
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "image.tiff",
-            data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "tiff")!)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "image.tiff",
+                data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "tiff")!)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         let task = try await client.create(file.id)
@@ -102,16 +109,18 @@ final class MosaicTests: XCTestCase {
         let client = factory.client.mosaic
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "image.webp",
-            data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "webp")!)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "image.webp",
+                data: Data(contentsOf: getResourceURL(forResource: "image", withExtension: "webp")!)
+            ))
         _ = try await factory.client.file.wait(file.id)
 
         let task = try await client.create(file.id)
diff --git a/Tests/OrganizationTests.swift b/Tests/OrganizationTests.swift
index 9349c07..6ed7557 100644
--- a/Tests/OrganizationTests.swift
+++ b/Tests/OrganizationTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class OrganizationTests: XCTestCase {
     var factory: DisposableFactory?
     var otherFactory: DisposableFactory?
@@ -18,24 +19,24 @@ final class OrganizationTests: XCTestCase {
         self.factory = factory
         let client = factory.client.organization
 
-        /* Create organizations */
+        // Create organizations
         var options: [VOOrganization.CreateOptions] = []
-        for index in 0 ..< 6 {
+        for index in 0..<6 {
             options.append(.init(name: "Test Organization \(index)"))
         }
         var organizations: [VOOrganization.Entity] = []
-        for index in 0 ..< options.count {
+        for index in 0..<options.count {
             try await organizations.append(factory.organization(options[index]))
         }
 
-        /* Test creation */
-        for index in 0 ..< organizations.count {
+        // Test creation
+        for index in 0..<organizations.count {
             XCTAssertEqual(organizations[index].name, options[index].name)
         }
 
-        /* Test list */
+        // Test list
 
-        /* Page 1 */
+        // Page 1
         let page1 = try await client.fetchList(.init(page: 1, size: 3))
         XCTAssertGreaterThanOrEqual(page1.totalElements, options.count)
         XCTAssertGreaterThanOrEqual(page1.totalPages, 2)
@@ -43,25 +44,25 @@ final class OrganizationTests: XCTestCase {
         XCTAssertEqual(page1.size, 3)
         XCTAssertEqual(page1.data.count, page1.size)
 
-        /* Page 2 */
+        // Page 2
         let page2 = try await client.fetchList(.init(page: 2, size: 3))
         XCTAssertGreaterThanOrEqual(page2.totalElements, options.count)
         XCTAssertEqual(page2.page, 2)
         XCTAssertEqual(page2.size, 3)
         XCTAssertEqual(page2.data.count, page2.size)
 
-        /* Test fetch */
+        // Test fetch
         let organization = try await client.fetch(organizations[0].id)
         XCTAssertEqual(organization.name, organizations[0].name)
 
-        /* Test patch name */
+        // Test patch name
         let newName = "New Organization"
         let alpha = try await client.patchName(organization.id, options: .init(name: newName))
         XCTAssertEqual(alpha.name, newName)
         let beta = try await factory.client.organization.fetch(organization.id)
         XCTAssertEqual(beta.name, newName)
 
-        /* Test leave */
+        // Test leave
         do {
             try await client.leave(organization.id)
             expectedToFail()
@@ -71,7 +72,7 @@ final class OrganizationTests: XCTestCase {
             invalidError(error)
         }
 
-        /* Test delete */
+        // Test delete
         for organization in organizations {
             try await client.delete(organization.id)
         }
@@ -106,10 +107,11 @@ final class OrganizationTests: XCTestCase {
         let organization = try await factory.organization(.init(name: "Test Organization"))
         let otherUser = try await otherFactory.client.identityUser.fetch()
 
-        let invitations = try await factory.client.invitation.create(.init(
-            organizationID: organization.id,
-            emails: [otherUser.email]
-        ))
+        let invitations = try await factory.client.invitation.create(
+            .init(
+                organizationID: organization.id,
+                emails: [otherUser.email]
+            ))
         try await otherFactory.client.invitation.accept(invitations.first!.id)
         let organizationAgain = try await otherClient.fetch(organization.id)
         XCTAssertEqual(organizationAgain.id, organization.id)
diff --git a/Tests/SnapshotsTests.swift b/Tests/SnapshotsTests.swift
index e9645c1..5d17a76 100644
--- a/Tests/SnapshotsTests.swift
+++ b/Tests/SnapshotsTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class SnapshotsTests: XCTestCase {
     var factory: DisposableFactory?
 
@@ -18,27 +19,29 @@ final class SnapshotsTests: XCTestCase {
         let client = factory.client.snapshot
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data("Test Content".utf8)
-        ))
-
-        /* Create snapshots by patching the existing file */
-        for index in 0 ..< 5 {
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data("Test Content".utf8)
+            ))
+
+        // Create snapshots by patching the existing file
+        for index in 0..<5 {
             _ = try await factory.client.file.patch(
                 file.id,
                 options: .init(data: Data("Another Test Content \(index)".utf8), name: file.name)
             )
         }
 
-        /* Test we receive a snapshot list */
-        for index in 1 ..< 3 {
+        // Test we receive a snapshot list
+        for index in 1..<3 {
             let page = try await client.fetchList(.init(fileID: file.id, page: index, size: 3))
             XCTAssertEqual(page.page, index)
             XCTAssertEqual(page.size, 3)
@@ -111,35 +114,37 @@ final class SnapshotsTests: XCTestCase {
         self.factory = factory
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         let url = getResourceURL(forResource: "video", withExtension: "mp4")!
         let data = try Data(contentsOf: url)
-        var file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: url.lastPathComponent,
-            data: data
-        ))
-
-        /* Test original is valid */
+        var file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: url.lastPathComponent,
+                data: data
+            ))
+
+        // Test original is valid
         XCTAssertNotNil(file.snapshot)
         XCTAssertEqual(file.snapshot!.original.fileExtension, ".mp4")
         XCTAssertEqual(file.snapshot!.original.size, data.count)
 
         file = try await factory.client.file.wait(file.id)
 
-        /* Test preview is nil */
+        // Test preview is nil
         XCTAssertNotNil(file.snapshot!.preview)
         XCTAssertNotNil(file.snapshot!.preview?.fileExtension, ".mp4")
         XCTAssertGreaterThan(file.snapshot!.preview!.size!, 0)
         XCTAssertNil(file.snapshot!.preview!.image)
         XCTAssertNil(file.snapshot!.preview!.document)
 
-        /* Test thumbnail is valid */
+        // Test thumbnail is valid
         XCTAssertNotNil(file.snapshot!.thumbnail)
         XCTAssertNotNil(file.snapshot!.thumbnail!.image)
         XCTAssertGreaterThan(file.snapshot!.thumbnail!.size!, 0)
@@ -163,28 +168,30 @@ final class SnapshotsTests: XCTestCase {
         self.factory = factory
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         let url = getResourceURL(forResource: resource, withExtension: fileExtension)!
         let data = try Data(contentsOf: url)
-        var file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: url.lastPathComponent,
-            data: data
-        ))
-
-        /* Test original is valid */
+        var file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: url.lastPathComponent,
+                data: data
+            ))
+
+        // Test original is valid
         XCTAssertNotNil(file.snapshot)
         XCTAssertEqual(file.snapshot!.original.fileExtension, ".\(fileExtension)")
         XCTAssertEqual(file.snapshot!.original.size, data.count)
 
         file = try await factory.client.file.wait(file.id)
 
-        /* Test preview is valid */
+        // Test preview is valid
         XCTAssertNotNil(file.snapshot!.preview)
         XCTAssertNotNil(file.snapshot!.preview?.fileExtension, ".\(previewExtension)")
         XCTAssertGreaterThan(file.snapshot!.preview!.size!, 0)
@@ -193,14 +200,13 @@ final class SnapshotsTests: XCTestCase {
         XCTAssertEqual(file.snapshot!.preview!.image!.height, height)
         XCTAssertNil(file.snapshot!.preview!.document)
 
-        /* Test thumbnail is valid */
+        // Test thumbnail is valid
         XCTAssertNotNil(file.snapshot!.thumbnail)
         XCTAssertNotNil(file.snapshot!.thumbnail!.image)
         XCTAssertGreaterThan(file.snapshot!.thumbnail!.size!, 0)
         XCTAssertEqual(file.snapshot!.thumbnail!.fileExtension, ".\(thumbnailExtension)")
         XCTAssertTrue(
-            file.snapshot!.thumbnail!.image!.width == 512 ||
-                file.snapshot!.thumbnail!.image!.height == 512)
+            file.snapshot!.thumbnail!.image!.width == 512 || file.snapshot!.thumbnail!.image!.height == 512)
     }
 
     func checkDocumentFlow(forResource resource: String, withExtension fileExtension: String) async throws {
@@ -211,28 +217,30 @@ final class SnapshotsTests: XCTestCase {
         self.factory = factory
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         let url = getResourceURL(forResource: resource, withExtension: fileExtension)!
         let data = try Data(contentsOf: url)
-        var file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: url.lastPathComponent,
-            data: data
-        ))
-
-        /* Test original is valid */
+        var file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: url.lastPathComponent,
+                data: data
+            ))
+
+        // Test original is valid
         XCTAssertNotNil(file.snapshot)
         XCTAssertEqual(file.snapshot!.original.fileExtension, ".\(fileExtension)")
         XCTAssertEqual(file.snapshot!.original.size, data.count)
 
         file = try await factory.client.file.wait(file.id)
 
-        /* Test preview is valid */
+        // Test preview is valid
         XCTAssertNotNil(file.snapshot!.preview)
         XCTAssertNotNil(file.snapshot!.preview?.fileExtension, ".pdf")
         XCTAssertGreaterThan(file.snapshot!.preview!.size!, 0)
@@ -245,14 +253,13 @@ final class SnapshotsTests: XCTestCase {
         )
         XCTAssertNil(file.snapshot!.preview!.image)
 
-        /* Test thumbnail is valid */
+        // Test thumbnail is valid
         XCTAssertNotNil(file.snapshot!.thumbnail)
         XCTAssertNotNil(file.snapshot!.thumbnail!.image)
         XCTAssertGreaterThan(file.snapshot!.thumbnail!.size!, 0)
         XCTAssertEqual(file.snapshot!.thumbnail!.fileExtension, ".png")
         XCTAssertTrue(
-            file.snapshot!.thumbnail!.image!.width == 512 ||
-                file.snapshot!.thumbnail!.image!.height == 512)
+            file.snapshot!.thumbnail!.image!.width == 512 || file.snapshot!.thumbnail!.image!.height == 512)
     }
 
     override func tearDown() async throws {
diff --git a/Tests/StorageTests.swift b/Tests/StorageTests.swift
index 00e941d..d35302f 100644
--- a/Tests/StorageTests.swift
+++ b/Tests/StorageTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class StorageTests: XCTestCase {
     var factory: DisposableFactory?
 
@@ -18,20 +19,22 @@ final class StorageTests: XCTestCase {
         let client = factory.client.storage
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         let usage = try await client.fetchAccountUsage()
         XCTAssertGreaterThanOrEqual(usage.maxBytes, workspace.storageCapacity)
 
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data("Test Content".utf8)
-        ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data("Test Content".utf8)
+            ))
         let usageAgain = try await client.fetchAccountUsage()
         XCTAssertGreaterThanOrEqual(usageAgain.percentage, 0)
         XCTAssertGreaterThanOrEqual(usageAgain.bytes, file.snapshot!.original.size!)
@@ -46,22 +49,24 @@ final class StorageTests: XCTestCase {
         let client = factory.client.storage
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         let usage = try await client.fetchWorkspaceUsage(workspace.id)
         XCTAssertEqual(usage.bytes, 0)
         XCTAssertEqual(usage.percentage, 0)
         XCTAssertEqual(usage.maxBytes, workspace.storageCapacity)
 
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File",
-            data: Data("Test Content".utf8)
-        ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File",
+                data: Data("Test Content".utf8)
+            ))
         let usageAgain = try await client.fetchWorkspaceUsage(workspace.id)
         XCTAssertEqual(usageAgain.bytes, file.snapshot!.original.size!)
     }
@@ -75,16 +80,18 @@ final class StorageTests: XCTestCase {
         let client = factory.client.storage
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.txt",
-            data: Data("Test Content".utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.txt",
+                data: Data("Test Content".utf8)
+            ))
 
         let usage = try await client.fetchFileUsage(file.id)
         XCTAssertEqual(usage.bytes, file.snapshot!.original.size!)
diff --git a/Tests/TaskTests.swift b/Tests/TaskTests.swift
index 5db9280..7682f9c 100644
--- a/Tests/TaskTests.swift
+++ b/Tests/TaskTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class TaskTests: XCTestCase {
     var factory: DisposableFactory?
 
@@ -18,18 +19,20 @@ final class TaskTests: XCTestCase {
         let client = factory.client.task
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
 
         // Here we intentionally create a file that fails the conversion so the task is not quickly deleted
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.jpg",
-            data: Data("Test Content".utf8)
-        ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.jpg",
+                data: Data("Test Content".utf8)
+            ))
 
         let user = try await factory.client.identityUser.fetch()
 
@@ -46,16 +49,18 @@ final class TaskTests: XCTestCase {
         let client = factory.client.task
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        _ = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.jpg",
-            data: Data("Test Content".utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        _ = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.jpg",
+                data: Data("Test Content".utf8)
+            ))
 
         let list = try await client.fetchList(.init())
 
@@ -73,16 +78,18 @@ final class TaskTests: XCTestCase {
         let client = factory.client.task
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        _ = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File",
-            data: Data("Test Content".utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        _ = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File",
+                data: Data("Test Content".utf8)
+            ))
 
         let count = try await client.fetchCount()
 
@@ -100,20 +107,22 @@ final class TaskTests: XCTestCase {
         let client = factory.client.task
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
-        let workspace = try await factory.workspace(.init(
-            name: "Test Workspace",
-            organizationID: organization.id,
-            storageCapacity: 100_000_000
-        ))
-        let file = try await factory.file(.init(
-            workspaceID: workspace.id,
-            name: "Test File.jpg",
-            data: Data("Test Content".utf8)
-        ))
+        let workspace = try await factory.workspace(
+            .init(
+                name: "Test Workspace",
+                organizationID: organization.id,
+                storageCapacity: 100_000_000
+            ))
+        let file = try await factory.file(
+            .init(
+                workspaceID: workspace.id,
+                name: "Test File.jpg",
+                data: Data("Test Content".utf8)
+            ))
 
         var task = try await client.fetch(file.snapshot!.task!.id)
 
-        /* Wait for the task to stop so we can dismiss it */
+        // Wait for the task to stop so we can dismiss it
         repeat {
             task = try await client.fetch(task.id)
             sleep(1)
diff --git a/Tests/WorkspaceTests.swift b/Tests/WorkspaceTests.swift
index 5f7501f..d52d0e0 100644
--- a/Tests/WorkspaceTests.swift
+++ b/Tests/WorkspaceTests.swift
@@ -3,9 +3,10 @@
 // Use of this software is governed by the MIT License
 // included in the file LICENSE in the root of this repository.
 
-@testable import VoltaserveCore
 import XCTest
 
+@testable import VoltaserveCore
+
 final class WorkspaceTests: XCTestCase {
     var factory: DisposableFactory?
 
@@ -19,30 +20,31 @@ final class WorkspaceTests: XCTestCase {
 
         let organization = try await factory.organization(.init(name: "Test Organization"))
 
-        /* Create workspaces */
+        // Create workspaces
         var options: [VOWorkspace.CreateOptions] = []
-        for index in 0 ..< 6 {
-            options.append(.init(
-                name: "Test Workspace \(index)",
-                organizationID: organization.id,
-                storageCapacity: 100_000_000 + index
-            ))
+        for index in 0..<6 {
+            options.append(
+                .init(
+                    name: "Test Workspace \(index)",
+                    organizationID: organization.id,
+                    storageCapacity: 100_000_000 + index
+                ))
         }
         var workspaces: [VOWorkspace.Entity] = []
-        for index in 0 ..< options.count {
+        for index in 0..<options.count {
             try await workspaces.append(factory.workspace(options[index]))
         }
 
-        /* Test creation */
-        for index in 0 ..< workspaces.count {
+        // Test creation
+        for index in 0..<workspaces.count {
             XCTAssertEqual(workspaces[index].name, options[index].name)
             XCTAssertEqual(workspaces[index].organization.id, options[index].organizationID)
             XCTAssertEqual(workspaces[index].storageCapacity, options[index].storageCapacity)
         }
 
-        /* Test list */
+        // Test list
 
-        /* Page 1 */
+        // Page 1
         let page1 = try await client.fetchList(.init(page: 1, size: 3))
         XCTAssertGreaterThanOrEqual(page1.totalElements, options.count)
         XCTAssertGreaterThanOrEqual(page1.totalPages, 2)
@@ -50,27 +52,27 @@ final class WorkspaceTests: XCTestCase {
         XCTAssertEqual(page1.size, 3)
         XCTAssertEqual(page1.data.count, page1.size)
 
-        /* Page 2 */
+        // Page 2
         let page2 = try await client.fetchList(.init(page: 2, size: 3))
         XCTAssertGreaterThanOrEqual(page2.totalElements, options.count)
         XCTAssertEqual(page2.page, 2)
         XCTAssertEqual(page2.size, 3)
         XCTAssertEqual(page2.data.count, page2.size)
 
-        /* Test fetch */
+        // Test fetch
         let workspace = try await client.fetch(workspaces[0].id)
         XCTAssertEqual(workspace.name, workspaces[0].name)
         XCTAssertEqual(workspace.organization.id, workspaces[0].organization.id)
         XCTAssertEqual(workspace.storageCapacity, workspaces[0].storageCapacity)
 
-        /* Test patch name */
+        // Test patch name
         let newName = "New Workspace"
         let resultAlpha = try await client.patchName(workspace.id, options: .init(name: newName))
         XCTAssertEqual(resultAlpha.name, newName)
         let workspaceAlpha = try await client.fetch(workspace.id)
         XCTAssertEqual(workspaceAlpha.name, newName)
 
-        /* Test patch storage capacity */
+        // Test patch storage capacity
         let newStorageCapacity = 200_000_000
         let resultBeta = try await client.patchStorageCapacity(
             workspace.id,
@@ -80,7 +82,7 @@ final class WorkspaceTests: XCTestCase {
         let workspaceBeta = try await client.fetch(workspace.id)
         XCTAssertEqual(workspaceBeta.storageCapacity, newStorageCapacity)
 
-        /* Test delete */
+        // Test delete
         for workspace in workspaces {
             try await client.delete(workspace.id)
         }
diff --git a/ci/swiftformat.zip b/ci/swiftformat.zip
deleted file mode 100644
index fefb376..0000000
Binary files a/ci/swiftformat.zip and /dev/null differ
diff --git a/ci/swiftlint.zip b/ci/swiftlint.zip
deleted file mode 100644
index 3bc7fac..0000000
Binary files a/ci/swiftlint.zip and /dev/null differ