Replace "(s)" with proper plurals when needed

One thing computers are really good at is counting. :)

So let's replace the ugly "(s)" with the proper plural where appropriate. With tests.