Added notice + event + test