JENKINS-21009 More unittests