#526: add new rules and tests
#526: fix tests
#526: fix test
Merge pull request #527 from mimmi20/issue-326

Fixes #526