TRQ-2761: Unit tests minor fixes