Improving multi event test