Minor storage fixes and test fixes to accommodate the new clearToken method.
Merge branch 'fix_clear_token'