fix MPS-18934 make generated tests code nearer to what it was in 2.5