Unit tests and grammatical updates.