expanded token service coverage
Merge pull request #630 from patriot1burke/master

expanded token service coverage