finished functionality of jenkins-24333

unit tests should be written