Adding some monkeypatch specs (refs #1), fixing some edge-case pluralizations.