TokenApi updates + delete, fixes & tests
Housekeeping