add new rules and tests
fix test
Merge pull request #355 from mimmi20/issue-350

Fixes #350