#4123 fix tests