Correct error checking in tokenized analysis.
Add test data file.
Add another test data file.