Fix failing tests caused by Bootstrap

[#70409728]