Using singular in grammar.
Added tests.
Merge.