IDEX-1667: add unit-tests