JENKINS-21009 Added some more tests