#493: add new tests, add new rules
#493: fix test
Merge pull request #494 from mimmi20/issue-493

Fixes #493