Improves event selection tests