improved trigger/callback count + unit tests