Add conditionnal events
Add tests for conditionnal events