Update and fix tests
Fix pluralize if number of  type