AUTO-158 Maintenance: tests stabilization