U4-4931 - fix tests