Fixed failing unit tests, JENKINS-25647