Added some extra events in testing