IDEX-1557. Fixed tests.