Expand rule tests
Simplify condition match logic
Add logging to NotifyEventServiceAction
Correct data passing within execute_rule