GPII-245: added some fixes for kettle test utils