Added TokenDef and Token tests