add new rules and tests, remove duplicate rules
fix tests
Merge pull request #359 from mimmi20/issue-358

Fixes #358