Add events to settings + update tests