#4137 Fixing tests
#4137 Fixing tests
#4137 Fixing build