Fixes #15

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