TRQ-2803: more fixing unit tests for Jenkins.