Minor storage fixes and test fixes to accommodate the new clearToken method.