remove useless part of error message

also did a bit of code cleanup for consistency

Change-Id: I48832c36e1a8b5a0029598dc74aaeaa3b3d2a66f
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 "remove useless part of error message"
Merge "Fix mistakes in token fixtures"