#497: added new tests
#497: change tests
#497: add new rules, change tests
#497: remove duplicate rule
Merge pull request #499 from mimmi20/issue-497

Fixes #497