Fix tests.
Merge branch 'master' of github.com:robertsdionne/nlp