[#52379287] Fix failing tests