Make tests work again, after adding to state.

credentials.state needs to store the scope, and also now
stores the estimated expiry time, to enable display to the
user how long is remaining in this session.

These tests needed to be altered to pass.