Improved pluralizer and added tests for it.