Tests modified to reach 79.66%. UI updated for events.