Timob 13233 Unit test fixes