[#12765] Make tests pass