Code review comment for lp:~gz/goose/client_identity_refactor_fix

Yes, unfortunately I read Ian's response on the review comments only after making this change. Because the identity package tests still asserted on Token, rather than using the rename to TokenId brought in with client, something needed to change. Will respond to the point on the original branch review.