Fix testing bug causing extra events