#4137 Fixing Tests