Add extra noun-phrase cases and tests