Item12888: unit test fixes