cleanup output, add simple event test