                 return
         }
 
-        guard let savedItem1 = Keychain.sharedInstance.addToken(token1),
-            let savedItem2 = Keychain.sharedInstance.addToken(token2),
-            let savedItem3 = Keychain.sharedInstance.addToken(token3) else {
+        guard let savedItem1 = keychain.addToken(token1),
+            let savedItem2 = keychain.addToken(token2),
+            let savedItem3 = keychain.addToken(token3) else {
                 XCTFail("Failed to save tokens")
                 return
         }
 
-        let allItems = Keychain.sharedInstance.allTokenItems()
+        let allItems = keychain.allTokenItems()
 
         XCTAssertNotNil(itemFromArray(allItems, withPersistentRef: savedItem1.persistentRef),
             "Token not recovered from keychain: \(token1)")

        XCTAssertEqual(token.generator.secret, NSData(bytes: kValidSecret, length: kValidSecret.count))

        // Save the token
        guard let keychainItem = Keychain.sharedInstance.addToken(token) else {
            XCTFail("Failed to save token to keychain")
            return
        }

        // Restore the token
        guard let secondKeychainItem = Keychain.sharedInstance.tokenItemForPersistentRef(keychainItem.persistentRef) else {
                XCTFail("Failed to recover keychain item for persistent ref")
                return
        }

        XCTAssertEqual(thirdKeychainItem.persistentRef, keychainItem.persistentRef)

        // Remove the token
        let success = keychain.deleteTokenItem(keychainItem)
        XCTAssertTrue(success)

        // Attempt to restore the deleted token
        let fourthKeychainItem = keychain.tokenItemForPersistentRef(keychainItem.persistentRef)
        XCTAssertNil(fourthKeychainItem)
    }

