More stubbing of events and added constants