EventBuilderTest updated