JC - 1748 fix autotests