             XCTAssertNotNil(itemFromArray(allItems, withPersistentRef: savedItem3.identifier),
                 "Token not recovered from keychain: \(token3)")
         } catch {
-            XCTFail("Error thrown from keychain: \(error)")
+            XCTFail("allPersistentTokens() failed with error: \(error)")
             return
         }
 

            let noItems = try keychain.allPersistentTokens()
            XCTAssert(noItems.isEmpty, "Array should be empty: \(noItems)")
        } catch {
            XCTFail("Error thrown from keychain: \(error)")
            return
        }


            // The deletion should throw and this line should never be reached.
            XCTFail("Removing again should fail: \(token1)")
        } catch {
            // This is the expected outcome
            // TODO: Assert the expected error type
        }
        do {
