Item12888: fixes for unit tests