                 XCTFail("Failed to recover persistent token with identifier: \(keychainItem.identifier)")
                 return
             }
-            XCTAssertEqual(secondKeychainItem.token, keychainItem.token)
-            XCTAssertEqual(secondKeychainItem.identifier, keychainItem.identifier)
+            XCTAssertEqual(secondKeychainItem, keychainItem)
         } catch {
             XCTFail("persistentTokenWithIdentifier(_:) failed with error: \(error)")
             return


        // Modify the token
        let modifiedToken = Token(name: "???", issuer: "!", generator: token.generator.successor())

        do {
            let modifiedKeychainItem = try keychain.updatePersistentToken(keychainItem,
                withToken: modifiedToken)

    }

    func testDuplicateURLs() {
        let token1 = kToken, token2 = kToken

        // Add both tokens to the keychain
        guard let savedItem1 = try? keychain.addToken(token1) else {
