[3.9] Tests optimization