TRQ-2892: Fixed unit tests.