IDEX-1022: Added tests