#4111 fix tests