#64903722 fix tests