IDEX-1716. Fixed tests.