TRQ-2803: more fixing to unit tests.