Added Pluralizer tests. Minor refactoring.