cleaning up test after implementation of tokenize(str:String, ...)

Along with #521, #523, fixes #1001866