Added back zero-unit pluralization

Edited tests to match pull request