More test goodness
Now we handle token expirations