[dcs] Consolidate token tests
Merge branch 'dcs-master'