TRQ-2803: more unit test fixing for Jenkins.