[JENKINS-18416] Fixing Unit Tests