fix for JENKINS-10914
* fixed tests