add new rules and test
change test
added engine
Merge pull request #423 from mimmi20/issue-415

Fixes #415