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