[JENKINS-17960 JENKINS-17781] Fixing tests