                 }, failure: { _ in
                     failed = true
                 })
-                expect(AuthToken.sharedKeychain.authToken) == "0237a2b08dfe6c30bd3c1525767efadffac942bbb6c045c924ff2eba1350c4aa"
+                expect(AuthToken().token) == "0237a2b08dfe6c30bd3c1525767efadffac942bbb6c045c924ff2eba1350c4aa"
+                expect(AuthToken().isPasswordBased) == true
                 expect(succeeded) == true
                 expect(failed) == false
             }

                }, failure: { _ in
                    failed = true
                })
                expect(AuthToken.sharedKeychain.authToken) == "0237a2b08dfe6c30bd3c1525767efadffac942bbb6c045c924ff2eba1350c4aa"
                expect(succeeded) == true
                expect(failed) == false
            }

                ElloProvider.sharedProvider = ElloProvider.RecordedStubbingProvider([
                    RecordedResponse(endpoint: .FriendStream, response: .NetworkResponse(401, NSData())),
                    RecordedResponse(endpoint: .ReAuth(token: ""), response: .NetworkResponse(401, NSData())),
                ])
                var succeeded = false
                var failed = false
                ElloProvider.shared.elloRequest(.FriendStream, success: { _ in
