             // 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
+            // An error thrown is the expected outcome
         }
         do {
             try keychain.deletePersistentToken(savedItem2)
             // The deletion should throw and this line should never be reached.
             XCTFail("Removing again should fail: \(token2)")
         } catch {
-            // This is the expected outcome
-            // TODO: Assert the expected error type
+            // An error thrown is the expected outcome
         }
     }
 
     func testAllTokensInKeychain() {
-        guard let token1 = Token.URLSerializer.deserialize(kValidTokenURL),
-            let token2 = Token.URLSerializer.deserialize(kValidTokenURL),
-            let token3 = Token.URLSerializer.deserialize(kValidTokenURL) else {
-                XCTFail("Failed to construct tokens from URL")
-                return
-        }
+        let token1 = kToken, token2 = kToken, token3 = kToken
 
         do {
             let noItems = try keychain.allPersistentTokens()

    }

    func testDuplicateURLs() {
        guard let token1 = Token.URLSerializer.deserialize(kValidTokenURL),
            let token2 = Token.URLSerializer.deserialize(kValidTokenURL) else {
                XCTFail("Failed to construct tokens from url.")
                return
        }

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

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