improved events test