[FIXED JENKINS-9965] Updated tests