Fix mistakes in token fixtures

There are two small mistakes i discovered in the token fixtures. Fix
these and add a bunch of new tests that would have caught them earlier.

Closes-Bug: #1342513
Closes-Bug: #1342515
Change-Id: I7c07bd915fd84cc77cae0004220d8bb8d79bb082
Merge "Fix mistakes in token fixtures"
Test commit