Attempt to fix tests #100500