changed rule, added test
added tests
fix tests
fix tests
Revert "fix tests"

This reverts commit d7677d05c9386ef81a4dc7b671ad6d960ff548cc.
Revert "Revert "fix tests""

This reverts commit e680a23516812bb21df95632098dbdb2fa0e6abc.
fix rules
fix tests
fix tests
fix tests
fix tests
fix test
fix tests
fix tests
Merge pull request #372 from mimmi20/issue-365

Fixes #365
Merge pull request #368 from mimmi20/issue-367

Fixes #367