[JENKINS-17067] Perfecting test cases