Close gh-235 Wrong pluralisation / singularilisation by the inflector is specific few cases (also vastly improved Unit Tests for the Inflector)