Some changes

* new tests + exceptions for wrong rule using
* new manual test
* other small changes