Improved eqc tests