Add -description for token
Add test for testing a whole entry
Fix tokenization issues