use constants for token typing
update tests