Fixed rules, fixed tests for modified rules and shortened rule error event
Revert "Fixed rules, fixed tests for modified rules and shortened rule error event"

This reverts commit 3f570318666b559d3fc4c0cd53c4e8a6c9d96380.
Fixed rules, fixed tests for modified rules and shortened rule error event