Test conditions improved