TRUNK-3407: Fix unit test