Adding event and fixing Unit Test that were not working anymore