New methods and tests for the new TokenStorageInterface

Adds new methods and tests for the new `TokenStorageInterface`.