Tokens now have POS and NER tags (with relevant tests)