Fix unit tests and add note [FIXED JENKINS-9457] [FIXED JENKINS-19773] [FIXED JENKINS-20526]