[JENKINS-18589] Updatign tests

(cherry picked from commit 87851d176503123ba35ffe22c5a56322d9c2b352)