JENKINS-20717 Added tests