#4137 Fixing tests