support disabling collection pluralization

closes #1350
refactor tests