Timob 13685 Fixed unit test regressions