             let recheckItem2 = try keychain.persistentTokenWithIdentifier(savedItem2.identifier)
             XCTAssertNil(recheckItem2, "Token should not be in keychain: \(token2)")
         } catch {
-            XCTFail("Error thrown from keychain: \(error)")
+            XCTFail("persistentTokenWithIdentifier(_:) failed with error: \(error)")
             return
         }
 

            try keychain.deletePersistentToken(savedItem1)
        } catch {
            XCTFail("deletePersistentToken(_:) failed with error: \(error)")
        }

        do {

            XCTAssertEqual(modifiedKeychainItem.identifier, keychainItem.identifier)
            XCTAssertEqual(modifiedKeychainItem.token, modifiedToken)
        } catch {
            XCTFail("updatePersistentToken(_:withToken:) failed with error: \(error)")
            return
        }

