IDEX-1530: added tests