added tests for token stuff.  Still needs work.