Add token deletion support.
Re-factor test coverage into separate methods.