Timob 13685 Fixed unit test regressions

**WARNING** PR #230 and PR #231 MUST be merged before merging this one.