Internal tokenstore vars are now private.
Added test, go fmt.