Added tests for IDEX-468