Fixing tests

Because are broken due events change.
Fixed by 2539fbe632e191a7f26331a3a652a6996689dbc2