Item12888: more fixes
Item12888: unit test fixes