TRQ-2949 - fixed unit tests.