MT#7319 try to fix the tests