JENKINS-20717 Fixed test after refactor