Fix client fixtures

Some of the client fixtures used for testing were invalid. v2
tokens must have 'access'/'token'/'expires', and v3 tokens must
have 'token'/'expires_at'.

Change-Id: I2614c7deed47c9758c2031418110108308634296
Related-Bug: #1174499
Test commit