IDEX-1644: added tests