IDEX-706, IDEX-811: fix unit-tests