[fixed JENKINS-16641] Revising tests