#4137 fix tests