TRQ-2761: minor build fixes
TRQ-2761: Unit test