Added - interface for token utility
Minor changes to token utility
Added - test token boilerplate