IDEX-811; IDEX-706: change unit-tests in according to code chnages