Testing events fix