IDEA-158861 make tests green