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

Fixes #386