improve code coverage
fix plural tests
Merge pull request #3 from punic/test-coverage

improve code coverage