INT-3460: fix tests