Add modal verbs, adverbs, update test suite