INT-2936 Polishing

Fix Test in 2.2.x branch.