[weld-commits] [weld/core] 362b51: Minor refactor and fix test to be more robust