JENKINS-15918 - Updating unit tests