Add another events test and fix from @iirvine