INT-3384: fix tests