Fix failing tests

#3560 

Try to fix the failing tests