IDEX-509: Added tests