IDEX-811; IDEX-706: update unit-tests