INT-275: Fix failed tests