Remove lock methods from Token

* Update unit tests