Update POS tagger and NER, add test cases