Send custom event + fix tests