TRQ-2803: more unit tests fixing.