                 "salt: \(salt.hex)",
                 "verificationKey: \(verificationKey.hex)",
                 "serverPrivateKey: \(server.privateKey.hex)",
-                "clientPrivateKey: \(client.privateKey?.hex ?? "N/A")"
-            ].joined(separator: ", ")
-        }
+                "serverPublicKey: \(server.publicKey.hex)",
+                "clientPrivateKey: \(client.privateKey?.hex ?? "N/A")",
+                "clientPublicKey: \(client.publicKey?.hex ?? "N/A")",
+            ]
+            return infos.joined(separator: ", ")
+        }
+
+        var additionalDebug: String = ""
 
         let A: Data
         do {

        let serverSessionKey: Data
        do {
            serverSessionKey = try server.getSessionKey()
        } catch {
            return XCTFail("Server didn't provide a session key: \(error) -- \(debugInfo())", file: file, line: line)
        }

        XCTAssertEqual(serverSessionKey, client.sessionKey, "Session keys not equal -- \(debugInfo())")
    }

    func testServer() {

import Foundation
import XCTest

@testable import SRP

class PySrptoolsTests: XCTestCase {
    func testClient() {
