fix token container tests.
Merge branch 'issue-41' into issue-44