Fix test-suite.
Add adjectives and nouns for later.