[#41394855] adapting tests