[JENKINS-18278] Fixing the tests