Fix tests after r213119 and r213120.