TRUNK-4056: change test to match logic