#4137 fixing tests